X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=2ccffae657ba898c70c3ff161b46276a49f64486;hb=be6a6276f221b9bc83c16e3c3ba6ca76f5f35350;hp=1efa5a1badf2ee8c6eed919aaa19b522c99e606e;hpb=4a4ab2c346036eebfa794e4f638ad529f462a051;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 1efa5a1ba..2ccffae65 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -27,6 +27,7 @@
 #include "channel.h"
 #include "event.h"
 #include "kernel.h"
+#include "lttng-sessiond.h"
 #include "ust-ctl.h"
 #include "ust-app.h"
 #include "trace-kernel.h"
@@ -314,7 +315,9 @@ end:
  * Enable all UST tracepoints for a channel from a UST session.
  */
 int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
+		struct ltt_ust_channel *uchan,
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret, i, size;
 	struct lttng_ht_iter iter;
@@ -365,7 +368,8 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
 		}
 
 		/* Create ust event */
-		uevent = trace_ust_create_event(&events[i], filter, NULL);
+		uevent = trace_ust_create_event(&events[i], filter_expression,
+			filter, NULL);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_FATAL;
 			goto error_destroy;
@@ -409,6 +413,7 @@ error:
  */
 int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct lttng_event *event,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion)
 {
@@ -424,7 +429,8 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	uevent = trace_ust_find_event(uchan->events, event->name, filter,
 			event->loglevel, exclusion);
 	if (uevent == NULL) {
-		uevent = trace_ust_create_event(event, filter, exclusion);
+		uevent = trace_ust_create_event(event, filter_expression,
+			filter, exclusion);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
@@ -616,7 +622,7 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
 int event_jul_enable_all(struct ltt_ust_session *usess,
-		struct lttng_event *event)
+		struct lttng_event *event, struct lttng_filter_bytecode *filter)
 {
 	int ret;
 	struct jul_event *jevent;
@@ -627,7 +633,7 @@ int event_jul_enable_all(struct ltt_ust_session *usess,
 	DBG("Event JUL enabling ALL events for session %" PRIu64, usess->id);
 
 	/* Enable event on JUL application through TCP socket. */
-	ret = event_jul_enable(usess, event);
+	ret = event_jul_enable(usess, event, filter);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}
@@ -651,7 +657,8 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
+int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret, created = 0;
 	struct jul_event *jevent;
@@ -665,7 +672,7 @@ int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
 
 	jevent = jul_find_event(event->name, event->loglevel, &usess->domain_jul);
 	if (!jevent) {
-		jevent = jul_create_event(event->name);
+		jevent = jul_create_event(event->name, filter);
 		if (!jevent) {
 			ret = LTTNG_ERR_NOMEM;
 			goto error;
@@ -709,6 +716,9 @@ int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
 {
 	int ret;
 	struct jul_event *jevent;
+	struct ltt_ust_event *uevent = NULL;
+	struct ltt_ust_channel *uchan = NULL;
+	char *ust_event_name;
 
 	assert(usess);
 	assert(event_name);
@@ -726,6 +736,39 @@ int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
 		goto end;
 	}
 
+	/*
+	 * Disable it on the UST side. First get the channel reference then find
+	 * the event and finally disable it.
+	 */
+	uchan = trace_ust_find_channel_by_name(usess->domain_global.channels,
+			DEFAULT_JUL_CHANNEL_NAME);
+	if (!uchan) {
+		ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+		goto error;
+	}
+
+	if (is_root) {
+		ust_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
+	} else {
+		ust_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+	}
+
+	/*
+	 * The loglevel is hardcoded with 0 here since the JUL ust event is set
+	 * with the loglevel type to ALL thus the loglevel stays 0. The event's
+	 * filter is the one handling the loglevel for JUL.
+	 */
+	uevent = trace_ust_find_event(uchan->events, ust_event_name,
+			jevent->filter, 0, NULL);
+	/* If the JUL event exists, it must be available on the UST side. */
+	assert(uevent);
+
+	ret = ust_app_disable_event_glb(usess, uchan, uevent);
+	if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
+		ret = LTTNG_ERR_UST_DISABLE_FAIL;
+		goto error;
+	}
+
 	ret = jul_disable_event(jevent);
 	if (ret != LTTNG_OK) {
 		goto error;