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

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 791251e7d..1efa5a1ba 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -48,6 +48,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),
@@ -350,7 +351,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
 		 * previously.
 		 */
 		uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
-				events[i].loglevel);
+				events[i].loglevel, NULL);
 		if (uevent != NULL) {
 			ret = ust_app_enable_event_pid(usess, uchan, uevent,
 					events[i].pid);
@@ -364,7 +365,7 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
 		}
 
 		/* Create ust event */
-		uevent = trace_ust_create_event(&events[i], filter);
+		uevent = trace_ust_create_event(&events[i], filter, NULL);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_FATAL;
 			goto error_destroy;
@@ -421,9 +422,9 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	rcu_read_lock();
 
 	uevent = trace_ust_find_event(uchan->events, event->name, filter,
-			event->loglevel);
+			event->loglevel, exclusion);
 	if (uevent == NULL) {
-		uevent = trace_ust_create_event(event, filter);
+		uevent = trace_ust_create_event(event, filter, exclusion);
 		if (uevent == NULL) {
 			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
@@ -614,24 +615,19 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_jul_enable_all(struct ltt_ust_session *usess)
+int event_jul_enable_all(struct ltt_ust_session *usess,
+		struct lttng_event *event)
 {
 	int ret;
 	struct jul_event *jevent;
-	struct lttng_event event;
 	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';
-
 	/* Enable event on JUL application through TCP socket. */
-	ret = event_jul_enable(usess, &event);
+	ret = event_jul_enable(usess, event);
 	if (ret != LTTNG_OK) {
 		goto error;
 	}
@@ -663,15 +659,19 @@ int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
 	assert(usess);
 	assert(event);
 
-	DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id);
+	DBG("Event JUL 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 = jul_find_event(event->name, event->loglevel, &usess->domain_jul);
 	if (!jevent) {
 		jevent = jul_create_event(event->name);
 		if (!jevent) {
 			ret = LTTNG_ERR_NOMEM;
 			goto error;
 		}
+		jevent->loglevel = event->loglevel;
+		jevent->loglevel_type = event->loglevel_type;
 		created = 1;
 	}
 
@@ -715,7 +715,7 @@ int event_jul_disable(struct ltt_ust_session *usess, char *event_name)
 
 	DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id);
 
-	jevent = jul_find_by_name(event_name, &usess->domain_jul);
+	jevent = jul_find_event_by_name(event_name, &usess->domain_jul);
 	if (!jevent) {
 		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
 		goto error;