X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=8be9fc6c44611b551ecfa22f60663c589dcfbf92;hp=c9c2f17f4a24450d561e7d4d607f95c5744de2a5;hb=561c68970ca461ccf8451aee47efc29da20ad8f1;hpb=6775595e33fcf411716849374390e5f8179c8735

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index c9c2f17f4..8be9fc6c4 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -32,11 +32,36 @@
 #include "trace-kernel.h"
 #include "trace-ust.h"
 
+/*
+ * Add unique UST event based on the event name, filter bytecode and loglevel.
+ */
+static void add_unique_ust_event(struct lttng_ht *ht,
+		struct ltt_ust_event *event)
+{
+	struct cds_lfht_node *node_ptr;
+	struct ltt_ust_ht_key key;
+
+	assert(ht);
+	assert(ht->ht);
+	assert(event);
+
+	key.name = event->attr.name;
+	key.filter = (struct lttng_filter_bytecode *) event->filter;
+	key.loglevel = event->attr.loglevel;
+
+	node_ptr = cds_lfht_add_unique(ht->ht,
+			ht->hash_fct(event->node.key, lttng_ht_seed),
+			trace_ust_ht_match_event, &key, &event->node.node);
+	assert(node_ptr == &event->node.node);
+}
+
 /*
  * Setup a lttng_event used to enable *all* syscall tracing.
  */
 static void init_syscalls_kernel_event(struct lttng_event *event)
 {
+	assert(event);
+
 	event->name[0] = '\0';
 	/*
 	 * We use LTTNG_EVENT* here since the trace kernel creation will make the
@@ -48,28 +73,30 @@ static void init_syscalls_kernel_event(struct lttng_event *event)
 /*
  * Disable kernel tracepoint event for a channel from the kernel session.
  */
-int event_kernel_disable_tracepoint(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, char *event_name)
+int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan,
+		char *event_name)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
 
+	assert(kchan);
+
 	kevent = trace_kernel_get_event_by_name(event_name, kchan);
 	if (kevent == NULL) {
-		ret = LTTCOMM_NO_EVENT;
+		ret = LTTNG_ERR_NO_EVENT;
 		goto error;
 	}
 
 	ret = kernel_disable_event(kevent);
 	if (ret < 0) {
-		ret = LTTCOMM_KERN_DISABLE_FAIL;
+		ret = LTTNG_ERR_KERN_DISABLE_FAIL;
 		goto error;
 	}
 
 	DBG("Kernel event %s disable for channel %s.",
 			kevent->event->name, kchan->channel->name);
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 
 error:
 	return ret;
@@ -78,12 +105,13 @@ error:
 /*
  * Disable kernel tracepoint events for a channel from the kernel session.
  */
-int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan)
+int event_kernel_disable_all_tracepoints(struct ltt_kernel_channel *kchan)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
 
+	assert(kchan);
+
 	/* For each event in the kernel session */
 	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
 		ret = kernel_disable_event(kevent);
@@ -92,57 +120,60 @@ int event_kernel_disable_all_tracepoints(struct ltt_kernel_session *ksession,
 			continue;
 		}
 	}
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 	return ret;
 }
 
 /*
  * Disable kernel syscall events for a channel from the kernel session.
  */
-int event_kernel_disable_all_syscalls(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan)
+int event_kernel_disable_all_syscalls(struct ltt_kernel_channel *kchan)
 {
 	ERR("Cannot disable syscall tracing for existing session. Please destroy session instead.");
-	return LTTCOMM_OK;	/* Return OK so disable all succeeds */
+	return LTTNG_OK;	/* Return OK so disable all succeeds */
 }
 
 /*
  * Disable all kernel event for a channel from the kernel session.
  */
-int event_kernel_disable_all(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan)
+int event_kernel_disable_all(struct ltt_kernel_channel *kchan)
 {
 	int ret;
 
-	ret = event_kernel_disable_all_tracepoints(ksession, kchan);
-	if (ret != LTTCOMM_OK)
+	assert(kchan);
+
+	ret = event_kernel_disable_all_tracepoints(kchan);
+	if (ret != LTTNG_OK)
 		return ret;
-	ret = event_kernel_disable_all_syscalls(ksession, kchan);
+	ret = event_kernel_disable_all_syscalls(kchan);
 	return ret;
 }
 
 /*
  * Enable kernel tracepoint event for a channel from the kernel session.
  */
-int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, struct lttng_event *event)
+int event_kernel_enable_tracepoint(struct ltt_kernel_channel *kchan,
+		struct lttng_event *event)
 {
 	int ret;
 	struct ltt_kernel_event *kevent;
 
+	assert(kchan);
+	assert(event);
+
 	kevent = trace_kernel_get_event_by_name(event->name, kchan);
 	if (kevent == NULL) {
 		ret = kernel_create_event(event, kchan);
 		if (ret < 0) {
 			switch (-ret) {
 			case EEXIST:
-				ret = LTTCOMM_KERN_EVENT_EXIST;
+				ret = LTTNG_ERR_KERN_EVENT_EXIST;
 				break;
 			case ENOSYS:
-				ret = LTTCOMM_KERN_EVENT_ENOSYS;
+				ret = LTTNG_ERR_KERN_EVENT_ENOSYS;
 				break;
 			default:
-				ret = LTTCOMM_KERN_ENABLE_FAIL;
+				ret = LTTNG_ERR_KERN_ENABLE_FAIL;
 				break;
 			}
 			goto end;
@@ -150,16 +181,16 @@ int event_kernel_enable_tracepoint(struct ltt_kernel_session *ksession,
 	} else if (kevent->enabled == 0) {
 		ret = kernel_enable_event(kevent);
 		if (ret < 0) {
-			ret = LTTCOMM_KERN_ENABLE_FAIL;
+			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
 			goto end;
 		}
 	} else {
 		/* At this point, the event is considered enabled */
-		ret = LTTCOMM_KERN_EVENT_EXIST;
+		ret = LTTNG_ERR_KERN_EVENT_EXIST;
 		goto end;
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 end:
 	return ret;
 }
@@ -167,13 +198,15 @@ end:
 /*
  * Enable all kernel tracepoint events of a channel of the kernel session.
  */
-int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
+int event_kernel_enable_all_tracepoints(struct ltt_kernel_channel *kchan,
+		int kernel_tracer_fd)
 {
 	int size, i, ret;
 	struct ltt_kernel_event *kevent;
 	struct lttng_event *event_list = NULL;
 
+	assert(kchan);
+
 	/* For each event in the kernel session */
 	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
 		if (kevent->enabled == 0) {
@@ -187,7 +220,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 
 	size = kernel_list_events(kernel_tracer_fd, &event_list);
 	if (size < 0) {
-		ret = LTTCOMM_KERN_LIST_FAIL;
+		ret = LTTNG_ERR_KERN_LIST_FAIL;
 		goto end;
 	}
 
@@ -205,21 +238,22 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 	}
 	free(event_list);
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 end:
 	return ret;
-
 }
 
 /*
- * Enable all kernel tracepoint events of a channel of the kernel session.
+ * Enable all kernel sycalls events of a channel of the kernel session.
  */
-int event_kernel_enable_all_syscalls(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
+int event_kernel_enable_all_syscalls(struct ltt_kernel_channel *kchan,
+		int kernel_tracer_fd)
 {
 	int ret;
 	struct lttng_event event;
 
+	assert(kchan);
+
 	init_syscalls_kernel_event(&event);
 
 	DBG("Enabling all syscall tracing");
@@ -227,14 +261,14 @@ int event_kernel_enable_all_syscalls(struct ltt_kernel_session *ksession,
 	ret = kernel_create_event(&event, kchan);
 	if (ret < 0) {
 		if (ret == -EEXIST) {
-			ret = LTTCOMM_KERN_EVENT_EXIST;
+			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 		} else {
-			ret = LTTCOMM_KERN_ENABLE_FAIL;
+			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
 		}
 		goto end;
 	}
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 end:
 	return ret;
 }
@@ -242,13 +276,15 @@ end:
 /*
  * Enable all kernel events of a channel of the kernel session.
  */
-int event_kernel_enable_all(struct ltt_kernel_session *ksession,
-		struct ltt_kernel_channel *kchan, int kernel_tracer_fd)
+int event_kernel_enable_all(struct ltt_kernel_channel *kchan,
+		int kernel_tracer_fd)
 {
 	int tp_ret;
 
-	tp_ret = event_kernel_enable_all_tracepoints(ksession, kchan, kernel_tracer_fd);
-	if (tp_ret != LTTCOMM_OK) {
+	assert(kchan);
+
+	tp_ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
+	if (tp_ret != LTTNG_OK) {
 		goto end;
 	}
 
@@ -261,7 +297,7 @@ int event_kernel_enable_all(struct ltt_kernel_session *ksession,
 	 * tracepoints did not fail. Future work will allow us to send back
 	 * multiple errors to the client in one API call.
 	 */
-	(void) event_kernel_enable_all_syscalls(ksession, kchan, kernel_tracer_fd);
+	(void) event_kernel_enable_all_syscalls(kchan, kernel_tracer_fd);
 
 end:
 	return tp_ret;
@@ -276,177 +312,165 @@ end:
 /*
  * Enable all UST tracepoints for a channel from a UST session.
  */
-int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess, int domain,
-		struct ltt_ust_channel *uchan)
+int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
+		struct ltt_ust_channel *uchan, struct lttng_filter_bytecode *filter)
 {
 	int ret, i, size;
 	struct lttng_ht_iter iter;
 	struct ltt_ust_event *uevent = NULL;
 	struct lttng_event *events = NULL;
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-	{
-		/* Enable existing events */
-		cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
-				node.node) {
-			if (uevent->enabled == 0) {
-				ret = ust_app_enable_event_glb(usess, uchan, uevent);
-				if (ret < 0) {
-					continue;
-				}
-				uevent->enabled = 1;
-			}
-		}
+	assert(usess);
+	assert(uchan);
 
-		/* Get all UST available events */
-		size = ust_app_list_events(&events);
-		if (size < 0) {
-			ret = LTTCOMM_UST_LIST_FAIL;
-			goto error;
-		}
+	rcu_read_lock();
 
-		for (i = 0; i < size; i++) {
-			/*
-			 * Check if event exist and if so, continue since it was enable
-			 * previously.
-			 */
-			uevent = trace_ust_find_event_by_name(uchan->events,
-					events[i].name);
-			if (uevent != NULL) {
-				ret = ust_app_enable_event_pid(usess, uchan, uevent,
-						events[i].pid);
-				if (ret < 0) {
-					if (ret != -EEXIST) {
-						ret = LTTCOMM_UST_ENABLE_FAIL;
-						goto error;
-					}
-				}
+	/* Enable existing events */
+	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
+			node.node) {
+		if (uevent->enabled == 0) {
+			ret = ust_app_enable_event_glb(usess, uchan, uevent);
+			if (ret < 0) {
 				continue;
 			}
+			uevent->enabled = 1;
+		}
+	}
 
-			/* Create ust event */
-			uevent = trace_ust_create_event(&events[i]);
-			if (uevent == NULL) {
-				ret = LTTCOMM_FATAL;
-				goto error_destroy;
-			}
+	/* Get all UST available events */
+	size = ust_app_list_events(&events);
+	if (size < 0) {
+		ret = LTTNG_ERR_UST_LIST_FAIL;
+		goto error;
+	}
 
-			/* Create event for the specific PID */
+	for (i = 0; i < size; i++) {
+		/*
+		 * Check if event exist and if so, continue since it was enable
+		 * previously.
+		 */
+		uevent = trace_ust_find_event(uchan->events, events[i].name, filter,
+				events[i].loglevel);
+		if (uevent != NULL) {
 			ret = ust_app_enable_event_pid(usess, uchan, uevent,
 					events[i].pid);
 			if (ret < 0) {
-				if (ret == -EEXIST) {
-					ret = LTTCOMM_UST_EVENT_EXIST;
+				if (ret != -LTTNG_UST_ERR_EXIST) {
+					ret = LTTNG_ERR_UST_ENABLE_FAIL;
 					goto error;
-				} else {
-					ret = LTTCOMM_UST_ENABLE_FAIL;
-					goto error_destroy;
 				}
 			}
+			continue;
+		}
 
-			uevent->enabled = 1;
-			/* Add ltt ust event to channel */
-			rcu_read_lock();
-			lttng_ht_add_unique_str(uchan->events, &uevent->node);
-			rcu_read_unlock();
+		/* Create ust event */
+		uevent = trace_ust_create_event(&events[i], filter, NULL);
+		if (uevent == NULL) {
+			ret = LTTNG_ERR_FATAL;
+			goto error_destroy;
 		}
 
-		free(events);
-		break;
-	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTCOMM_UND;
-		goto error;
+		/* Create event for the specific PID */
+		ret = ust_app_enable_event_pid(usess, uchan, uevent,
+				events[i].pid);
+		if (ret < 0) {
+			if (ret == -LTTNG_UST_ERR_EXIST) {
+				ret = LTTNG_ERR_UST_EVENT_EXIST;
+				goto error;
+			} else {
+				ret = LTTNG_ERR_UST_ENABLE_FAIL;
+				goto error_destroy;
+			}
+		}
+
+		uevent->enabled = 1;
+		/* Add ltt ust event to channel */
+		rcu_read_lock();
+		add_unique_ust_event(uchan->events, uevent);
+		rcu_read_unlock();
 	}
+	free(events);
 
-	return LTTCOMM_OK;
+	rcu_read_unlock();
+	return LTTNG_OK;
 
 error_destroy:
 	trace_ust_destroy_event(uevent);
 
 error:
 	free(events);
+	rcu_read_unlock();
 	return ret;
 }
 
 /*
  * Enable UST tracepoint event for a channel from a UST session.
  */
-int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
-		struct ltt_ust_channel *uchan, struct lttng_event *event)
+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_event_exclusion *exclusion)
 {
-	int ret = LTTCOMM_OK, to_create = 0;
+	int ret = LTTNG_OK, to_create = 0;
 	struct ltt_ust_event *uevent;
 
-	uevent = trace_ust_find_event_by_name(uchan->events, event->name);
+	assert(usess);
+	assert(uchan);
+	assert(event);
+
+	rcu_read_lock();
+
+	uevent = trace_ust_find_event(uchan->events, event->name, filter,
+			event->loglevel);
 	if (uevent == NULL) {
-		uevent = trace_ust_create_event(event);
+		uevent = trace_ust_create_event(event, filter, exclusion);
 		if (uevent == NULL) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_UST_ENABLE_FAIL;
 			goto error;
 		}
+
 		/* Valid to set it after the goto error since uevent is still NULL */
 		to_create = 1;
 	}
 
 	if (uevent->enabled) {
 		/* It's already enabled so everything is OK */
+		ret = LTTNG_ERR_UST_EVENT_ENABLED;
 		goto end;
 	}
 
 	uevent->enabled = 1;
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-	{
-		if (to_create) {
-			/* Create event on all UST registered apps for session */
-			ret = ust_app_create_event_glb(usess, uchan, uevent);
-		} else {
-			/* Enable event on all UST registered apps for session */
-			ret = ust_app_enable_event_glb(usess, uchan, uevent);
-		}
+	if (to_create) {
+		/* Create event on all UST registered apps for session */
+		ret = ust_app_create_event_glb(usess, uchan, uevent);
+	} else {
+		/* Enable event on all UST registered apps for session */
+		ret = ust_app_enable_event_glb(usess, uchan, uevent);
+	}
 
-		if (ret < 0) {
-			if (ret == -EEXIST) {
-				ret = LTTCOMM_UST_EVENT_EXIST;
-				goto end;
-			} else {
-				ret = LTTCOMM_UST_ENABLE_FAIL;
-				goto error;
-			}
+	if (ret < 0) {
+		if (ret == -LTTNG_UST_ERR_EXIST) {
+			ret = LTTNG_ERR_UST_EVENT_EXIST;
+			goto end;
+		} else {
+			ret = LTTNG_ERR_UST_ENABLE_FAIL;
+			goto error;
 		}
-		break;
-	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTCOMM_UND;
-		goto end;
 	}
 
 	if (to_create) {
-		rcu_read_lock();
 		/* Add ltt ust event to channel */
-		lttng_ht_add_unique_str(uchan->events, &uevent->node);
-		rcu_read_unlock();
+		add_unique_ust_event(uchan->events, uevent);
 	}
 
 	DBG("Event UST %s %s in channel %s", uevent->attr.name,
 			to_create ? "created" : "enabled", uchan->name);
 
-	ret = LTTCOMM_OK;
+	ret = LTTNG_OK;
 
 end:
+	rcu_read_unlock();
 	return ret;
 
 error:
@@ -461,63 +485,80 @@ error:
 		/* In this code path, the uevent was not added to the hash table */
 		trace_ust_destroy_event(uevent);
 	}
+	rcu_read_unlock();
 	return ret;
 }
 
 /*
  * Disable UST tracepoint of a channel from a UST session.
  */
-int event_ust_disable_tracepoint(struct ltt_ust_session *usess, int domain,
+int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, char *event_name)
 {
 	int ret;
 	struct ltt_ust_event *uevent;
+	struct lttng_ht_node_str *node;
+	struct lttng_ht_iter iter;
+	struct lttng_ht *ht;
 
-	uevent = trace_ust_find_event_by_name(uchan->events, event_name);
-	if (uevent == NULL) {
-		ret = LTTCOMM_UST_EVENT_NOT_FOUND;
+	assert(usess);
+	assert(uchan);
+	assert(event_name);
+
+	ht = uchan->events;
+
+	rcu_read_lock();
+
+	/*
+	 * We use a custom lookup since we need the iterator for the next_duplicate
+	 * call in the do while loop below.
+	 */
+	cds_lfht_lookup(ht->ht, ht->hash_fct((void *) event_name, lttng_ht_seed),
+			trace_ust_ht_match_event_by_name, event_name, &iter.iter);
+	node = lttng_ht_iter_get_node_str(&iter);
+	if (node == NULL) {
+		DBG2("Trace UST event NOT found by name %s", event_name);
+		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
 		goto error;
 	}
 
-	if (uevent->enabled == 0) {
-		/* It's already enabled so everything is OK */
-		ret = LTTCOMM_OK;
-		goto end;
-	}
+	do {
+		uevent = caa_container_of(node, struct ltt_ust_event, node);
+		assert(uevent);
+
+		if (uevent->enabled == 0) {
+			/* It's already disabled so everything is OK */
+			goto next;
+		}
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
 		ret = ust_app_disable_event_glb(usess, uchan, uevent);
-		if (ret < 0 && ret != -EEXIST) {
-			ret = LTTCOMM_UST_DISABLE_FAIL;
+		if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
+			ret = LTTNG_ERR_UST_DISABLE_FAIL;
 			goto error;
 		}
-		break;
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTCOMM_UND;
-		goto error;
-	}
+		uevent->enabled = 0;
 
-	uevent->enabled = 0;
-	ret = LTTCOMM_OK;
+		DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
+				uchan->name);
 
-end:
-	DBG2("Event UST %s disabled in channel %s", uevent->attr.name,
-			uchan->name);
+next:
+		/* Get next duplicate event by name. */
+		cds_lfht_next_duplicate(ht->ht, trace_ust_ht_match_event_by_name,
+				event_name, &iter.iter);
+		node = lttng_ht_iter_get_node_str(&iter);
+	} while (node);
+
+	ret = LTTNG_OK;
 
 error:
+	rcu_read_unlock();
 	return ret;
 }
 
 /*
  * Disable all UST tracepoints for a channel from a UST session.
  */
-int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
+int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan)
 {
 	int ret, i, size;
@@ -525,59 +566,222 @@ int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess, int domain,
 	struct ltt_ust_event *uevent = NULL;
 	struct lttng_event *events = NULL;
 
-	switch (domain) {
-	case LTTNG_DOMAIN_UST:
-	{
-		/* Disabling existing events */
-		cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
-				node.node) {
-			if (uevent->enabled == 1) {
-				ret = ust_app_disable_event_glb(usess, uchan, uevent);
-				if (ret < 0) {
-					continue;
-				}
-				uevent->enabled = 0;
+	assert(usess);
+	assert(uchan);
+
+	rcu_read_lock();
+
+	/* Disabling existing events */
+	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent,
+			node.node) {
+		if (uevent->enabled == 1) {
+			ret = event_ust_disable_tracepoint(usess, uchan,
+					uevent->attr.name);
+			if (ret < 0) {
+				continue;
 			}
 		}
+	}
 
-		/* Get all UST available events */
-		size = ust_app_list_events(&events);
-		if (size < 0) {
-			ret = LTTCOMM_UST_LIST_FAIL;
-			goto error;
+	/* Get all UST available events */
+	size = ust_app_list_events(&events);
+	if (size < 0) {
+		ret = LTTNG_ERR_UST_LIST_FAIL;
+		goto error;
+	}
+
+	for (i = 0; i < size; i++) {
+		ret = event_ust_disable_tracepoint(usess, uchan,
+				events[i].name);
+		if (ret != LTTNG_OK) {
+			/* Continue to disable the rest... */
+			continue;
 		}
+	}
+	free(events);
 
-		for (i = 0; i < size; i++) {
-			uevent = trace_ust_find_event_by_name(uchan->events,
-					events[i].name);
-			if (uevent != NULL && uevent->enabled == 1) {
-				ret = ust_app_disable_event_pid(usess, uchan, uevent,
-						events[i].pid);
-				if (ret < 0 && ret != -EEXIST) {
-					ret = LTTCOMM_UST_DISABLE_FAIL;
-					goto error;
-				}
-				uevent->enabled = 0;
-				continue;
-			}
+	rcu_read_unlock();
+	return LTTNG_OK;
+
+error:
+	free(events);
+	rcu_read_unlock();
+	return ret;
+}
+
+/*
+ * Enable all JUL 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 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);
+	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,
+			node.node) {
+		jevent->enabled = 1;
+	}
+	rcu_read_unlock();
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}
+
+/*
+ * Enable a single JUL 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 ret, created = 0;
+	struct jul_event *jevent;
+
+	assert(usess);
+	assert(event);
+
+	DBG("Event JUL enabling %s for session %" PRIu64, event->name, usess->id);
+
+	jevent = jul_find_by_name(event->name, &usess->domain_jul);
+	if (!jevent) {
+		jevent = jul_create_event(event->name);
+		if (!jevent) {
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
 		}
+		created = 1;
+	}
 
-		free(events);
-		break;
+	/* Already enabled? */
+	if (jevent->enabled) {
+		goto end;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTCOMM_UND;
+
+	ret = jul_enable_event(jevent);
+	if (ret != LTTNG_OK) {
 		goto error;
 	}
 
-	return LTTCOMM_OK;
+	/* If the event was created prior to the enable, add it to the domain. */
+	if (created) {
+		jul_add_event(jevent, &usess->domain_jul);
+	}
+
+end:
+	return LTTNG_OK;
+
+error:
+	if (created) {
+		jul_destroy_event(jevent);
+	}
+	return ret;
+}
+
+/*
+ * Disable a single JUL 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 ret;
+	struct jul_event *jevent;
+
+	assert(usess);
+	assert(event_name);
+
+	DBG("Event JUL disabling %s for session %" PRIu64, event_name, usess->id);
+
+	jevent = jul_find_by_name(event_name, &usess->domain_jul);
+	if (!jevent) {
+		ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
+		goto error;
+	}
+
+	/* Already disabled? */
+	if (!jevent->enabled) {
+		goto end;
+	}
+
+	ret = jul_disable_event(jevent);
+	if (ret != LTTNG_OK) {
+		goto error;
+	}
+
+end:
+	return LTTNG_OK;
+
+error:
+	return ret;
+}
+/*
+ * Disable all JUL 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 ret, do_disable = 0;
+	struct jul_event *jevent;
+	struct lttng_ht_iter iter;
+
+	assert(usess);
+
+	/* Enable event on JUL application through TCP socket. */
+	ret = event_jul_disable(usess, "*");
+	if (ret != LTTNG_OK) {
+		if (ret == LTTNG_ERR_UST_EVENT_NOT_FOUND) {
+			/*
+			 * This means that no enable all was done before but still a user
+			 * could want to disable everything even though the * wild card
+			 * event does not exists.
+			 */
+			do_disable = 1;
+		} else {
+			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,
+			node.node) {
+		if (jevent->enabled && do_disable) {
+			ret = event_jul_disable(usess, jevent->name);
+			if (ret != LTTNG_OK) {
+				rcu_read_unlock();
+				goto error;
+			}
+		}
+		jevent->enabled = 0;
+	}
+	rcu_read_unlock();
+
+	ret = LTTNG_OK;
 
 error:
-	free(events);
 	return ret;
 }