X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=499a2490e65cd6b32a591e839bbe6baef05f36a5;hb=8c93562f396a3e785c5193ca32b40f1f16599a6a;hp=f22b812823a174e0d08561f0f80542e17a1bd986;hpb=8b0371373c32ffff29e08877033c2a29f89942f9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index f22b81282..499a2490e 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;
@@ -408,7 +409,8 @@ error:
  */
 int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct lttng_event *event,
-		struct lttng_filter_bytecode *filter)
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion)
 {
 	int ret = LTTNG_OK, to_create = 0;
 	struct ltt_ust_event *uevent;
@@ -420,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;
@@ -613,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;
 	}
@@ -662,7 +659,9 @@ 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);
 	if (!jevent) {
@@ -671,6 +670,8 @@ int event_jul_enable(struct ltt_ust_session *usess, struct lttng_event *event)
 			ret = LTTNG_ERR_NOMEM;
 			goto error;
 		}
+		jevent->loglevel = event->loglevel;
+		jevent->loglevel_type = event->loglevel_type;
 		created = 1;
 	}