X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fevent.c;h=247a4c6d7c7cae013d586439a9194561fbcf751e;hp=407f8441c60bb7ffd8bae71448498879738b47b3;hb=8f69e5eb13ccfc939f1a014d7244c687e1a49450;hpb=edb6738816b442fb81f12ea0079260c96c3a5759

diff --git a/lttng-sessiond/event.c b/lttng-sessiond/event.c
index 407f8441c..247a4c6d7 100644
--- a/lttng-sessiond/event.c
+++ b/lttng-sessiond/event.c
@@ -161,14 +161,16 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 {
 	int size, i, ret;
 	struct ltt_kernel_event *kevent;
-	struct lttng_event *event_list;
+	struct lttng_event *event_list = NULL;
 
 	/* For each event in the kernel session */
 	cds_list_for_each_entry(kevent, &kchan->events_list.head, list) {
-		ret = kernel_enable_event(kevent);
-		if (ret < 0) {
-			/* Enable failed but still continue */
-			continue;
+		if (kevent->enabled == 0) {
+			ret = kernel_enable_event(kevent);
+			if (ret < 0) {
+				/* Enable failed but still continue */
+				continue;
+			}
 		}
 	}
 
@@ -191,6 +193,7 @@ int event_kernel_enable_all_tracepoints(struct ltt_kernel_session *ksession,
 		}
 	}
 	free(event_list);
+
 	ret = LTTCOMM_OK;
 end:
 	return ret;
@@ -212,8 +215,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;
+		} else {
+			ret = LTTCOMM_KERN_ENABLE_FAIL;
+		}
 		goto end;
 	}
+
 	ret = LTTCOMM_OK;
 end:
 	return ret;
@@ -260,10 +269,10 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess, int domain,
 	{
 		if (to_create) {
 			/* Create event on all UST registered apps for session */
-			ret = ust_app_create_event_all(usess, uchan, uevent);
+			ret = ust_app_create_event_glb(usess, uchan, uevent);
 		} else {
 			/* Enable event on all UST registered apps for session */
-			ret = ust_app_enable_event_all(usess, uchan, uevent);
+			ret = ust_app_enable_event_glb(usess, uchan, uevent);
 		}
 
 		if (ret < 0) {