X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=7eea28121e3e55394c67fc96ad484d4574b5f4da;hp=31c3aff77d175571a44a1f0cfdc6befdb9a6c936;hb=d0ae4ea864f84fa2456563abb20fe42e5cc29625;hpb=29c62722c4e1146fe6e7585308f3e4497e39e908

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 31c3aff77..7eea28121 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1167,23 +1167,28 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 		switch (event->type) {
 		case LTTNG_EVENT_ALL:
-			ret = event_kernel_disable_all(kchan);
+			ret = event_kernel_disable_event_all(kchan);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
 			break;
-		case LTTNG_EVENT_TRACEPOINT:
+		case LTTNG_EVENT_TRACEPOINT:	/* fall-through */
+		case LTTNG_EVENT_SYSCALL:
 			if (!strcmp(event_name, "*")) {
-				ret = event_kernel_disable_all_tracepoints(kchan);
+				ret = event_kernel_disable_event_type(kchan,
+					event->type);
 			} else {
-				ret = event_kernel_disable_tracepoint(kchan, event_name);
+				ret = event_kernel_disable_event(kchan,
+					event_name);
 			}
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
 			break;
-		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_disable_syscall(kchan, event_name);
+		case LTTNG_EVENT_PROBE:
+		case LTTNG_EVENT_FUNCTION:
+		case LTTNG_EVENT_FUNCTION_ENTRY:
+			ret = event_kernel_disable_event(kchan, event_name);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1481,7 +1486,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		case LTTNG_EVENT_ALL:
 		{
 			event->type = LTTNG_EVENT_TRACEPOINT;	/* Hack */
-			ret = event_kernel_enable_tracepoint(kchan, event);
+			ret = event_kernel_enable_event(kchan, event);
 			if (ret != LTTNG_OK) {
 				if (channel_created) {
 					/* Let's not leak a useless channel. */
@@ -1490,7 +1495,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 				goto error;
 			}
 			event->type = LTTNG_EVENT_SYSCALL;	/* Hack */
-			ret = event_kernel_enable_syscall(kchan, event->name);
+			ret = event_kernel_enable_event(kchan, event);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1500,7 +1505,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		case LTTNG_EVENT_FUNCTION:
 		case LTTNG_EVENT_FUNCTION_ENTRY:
 		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_kernel_enable_tracepoint(kchan, event);
+			ret = event_kernel_enable_event(kchan, event);
 			if (ret != LTTNG_OK) {
 				if (channel_created) {
 					/* Let's not leak a useless channel. */
@@ -1510,7 +1515,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 			}
 			break;
 		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_enable_syscall(kchan, event->name);
+			ret = event_kernel_enable_event(kchan, event);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}