X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=80721a78848ef7850fb2162cb11157119fb58ffa;hb=022d91ba14053d6093a6d6a1af02a345c6fd42d2;hp=fedd18c85973292b3cf24f71b728f43d14f192f0;hpb=10646003ec8dd54b76990cf335ef2bc56ab17a3e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index fedd18c85..80721a788 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"
@@ -48,6 +49,7 @@ static void add_unique_ust_event(struct lttng_ht *ht,
 	key.name = event->attr.name;
 	key.filter = (struct lttng_filter_bytecode *) event->filter;
 	key.loglevel = event->attr.loglevel;
+	key.exclusion = event->exclusion;
 
 	node_ptr = cds_lfht_add_unique(ht->ht,
 			ht->hash_fct(event->node.key, lttng_ht_seed),
@@ -313,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;
@@ -364,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;
@@ -408,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)
 {
@@ -423,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;
@@ -610,35 +617,30 @@ error:
 }
 
 /*
- * Enable all JUL event for a given UST session.
+ * Enable all agent event for a given UST session.
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_jul_enable_all(struct ltt_ust_session *usess)
+int event_agent_enable_all(struct ltt_ust_session *usess,
+		struct lttng_event *event, struct lttng_filter_bytecode *filter)
 {
 	int ret;
-	struct jul_event *jevent;
-	struct lttng_event event;
+	struct agent_event *jevent;
 	struct lttng_ht_iter iter;
 
 	assert(usess);
 
-	DBG("Event JUL enabling ALL events for session %" PRIu64, usess->id);
-
-	/* Create the * wildcard event name for the Java agent. */
-	memset(event.name, 0, sizeof(event.name));
-	strncpy(event.name, "*", sizeof(event.name));
-	event.name[sizeof(event.name) - 1] = '\0';
+	DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
 
-	/* Enable event on JUL application through TCP socket. */
-	ret = event_jul_enable(usess, &event);
+	/* Enable event on agent application through TCP socket. */
+	ret = event_agent_enable(usess, event, filter);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}
 
 	/* Flag every event that they are now enabled. */
 	rcu_read_lock();
-	cds_lfht_for_each_entry(usess->domain_jul.events->ht, &iter.iter, jevent,
+	cds_lfht_for_each_entry(usess->agent.events->ht, &iter.iter, jevent,
 			node.node) {
 		jevent->enabled = 1;
 	}
@@ -651,27 +653,32 @@ error:
 }
 
 /*
- * Enable a single JUL event for a given UST session.
+ * Enable a single agent event for a given UST session.
  *
  * 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_agent_enable(struct ltt_ust_session *usess, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter)
 {
 	int ret, created = 0;
-	struct jul_event *jevent;
+	struct agent_event *jevent;
 
 	assert(usess);
 	assert(event);
 
-	DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id);
+	DBG("Event agent enabling %s for session %" PRIu64 " with loglevel type %d "
+			"and loglevel %d", event->name, usess->id, event->loglevel_type,
+			event->loglevel);
 
-	jevent = jul_find_by_name(event->name, &usess->domain_jul);
+	jevent = agent_find_event(event->name, event->loglevel, &usess->agent);
 	if (!jevent) {
-		jevent = jul_create_event(event->name);
+		jevent = agent_create_event(event->name, filter);
 		if (!jevent) {
 			ret = LTTNG_ERR_NOMEM;
 			goto error;
 		}
+		jevent->loglevel = event->loglevel;
+		jevent->loglevel_type = event->loglevel_type;
 		created = 1;
 	}
 
@@ -680,14 +687,14 @@ int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
 		goto end;
 	}
 
-	ret = jul_enable_event(jevent);
+	ret = agent_enable_event(jevent);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}
 
 	/* If the event was created prior to the enable, add it to the domain. */
 	if (created) {
-		jul_add_event(jevent, &usess->domain_jul);
+		agent_add_event(jevent, &usess->agent);
 	}
 
 end:
@@ -695,27 +702,30 @@ end:
 
 error:
 	if (created) {
-		jul_destroy_event(jevent);
+		agent_destroy_event(jevent);
 	}
 	return ret;
 }
 
 /*
- * Disable a single JUL event for a given UST session.
+ * Disable a single agent event for a given UST session.
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
+int event_agent_disable(struct ltt_ust_session *usess, char *event_name)
 {
 	int ret;
-	struct jul_event *jevent;
+	struct agent_event *jevent;
+	struct ltt_ust_event *uevent = NULL;
+	struct ltt_ust_channel *uchan = NULL;
+	char *ust_event_name;
 
 	assert(usess);
 	assert(event_name);
 
-	DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id);
+	DBG("Event agent disabling %s for session %" PRIu64, event_name, usess->id);
 
-	jevent = jul_find_by_name(event_name, &usess->domain_jul);
+	jevent = agent_find_event_by_name(event_name, &usess->agent);
 	if (!jevent) {
 		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
 		goto error;
@@ -726,7 +736,40 @@ int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
 		goto end;
 	}
 
-	ret = jul_disable_event(jevent);
+	/*
+	 * 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 agent 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 agent.
+	 */
+	uevent = trace_ust_find_event(uchan->events, ust_event_name,
+			jevent->filter, 0, NULL);
+	/* If the agent 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 = agent_disable_event(jevent);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}
@@ -738,20 +781,20 @@ error:
 	return ret;
 }
 /*
- * Disable all JUL event for a given UST session.
+ * Disable all agent event for a given UST session.
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_jul_disable_all(struct ltt_ust_session *usess)
+int event_agent_disable_all(struct ltt_ust_session *usess)
 {
 	int ret, do_disable = 0;
-	struct jul_event *jevent;
+	struct agent_event *jevent;
 	struct lttng_ht_iter iter;
 
 	assert(usess);
 
-	/* Enable event on JUL application through TCP socket. */
-	ret = event_jul_disable(usess, "*");
+	/* Enable event on agent application through TCP socket. */
+	ret = event_agent_disable(usess, "*");
 	if (ret != LTTNG_OK) {
 		if (ret == LTTNG_ERR_UST_EVENT_NOT_FOUND) {
 			/*
@@ -767,10 +810,10 @@ int event_jul_disable_all(struct ltt_ust_session *usess)
 
 	/* Flag every event that they are now enabled. */
 	rcu_read_lock();
-	cds_lfht_for_each_entry(usess->domain_jul.events->ht, &iter.iter, jevent,
+	cds_lfht_for_each_entry(usess->agent.events->ht, &iter.iter, jevent,
 			node.node) {
 		if (jevent->enabled && do_disable) {
-			ret = event_jul_disable(usess, jevent->name);
+			ret = event_agent_disable(usess, jevent->name);
 			if (ret != LTTNG_OK) {
 				rcu_read_unlock();
 				goto error;