X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=7532e2c3bdde96e18c6d82772bf2b9ae3fbb146c;hp=e1bf1e416b49be23b8ca860d21062249b70a01df;hb=7a3d132871a4414b6cd232e7f41e6a1f50d9bf16;hpb=cd84aa763efa60969f15757d46a09a884ea97fc8

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index e1bf1e416..7532e2c3b 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -1739,6 +1739,9 @@ static void list_lttng_events(struct ltt_kernel_channel *kchan,
 			case LTTNG_KERNEL_SYSCALL:
 				events[i].type = LTTNG_EVENT_SYSCALL;
 				break;
+			case LTTNG_KERNEL_ALL:
+				assert(0);
+				break;
 		}
 		i++;
 	}
@@ -1910,7 +1913,7 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = event_kernel_disable(session->kernel_session, kchan, event_name);
+		ret = event_kernel_disable_tracepoint(session->kernel_session, kchan, event_name);
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -2027,7 +2030,7 @@ static int cmd_enable_event(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = event_kernel_enable(session->kernel_session, kchan, event);
+		ret = event_kernel_enable_tracepoint(session->kernel_session, kchan, event);
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -2077,18 +2080,28 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		if (event_type == LTTNG_KERNEL_SYSCALL) {
-			ret = event_kernel_enable_syscalls(session->kernel_session,
+		switch (event_type) {
+		case LTTNG_KERNEL_SYSCALL:
+			ret = event_kernel_enable_all_syscalls(session->kernel_session,
 					kchan, kernel_tracer_fd);
-		} else {
+			break;
+		case LTTNG_KERNEL_TRACEPOINT:
 			/*
-			 * This call enables all LTTNG_KERNEL_TRACEPOINTS and events
-			 * already registered to the channel.
+			 * This call enables all LTTNG_KERNEL_TRACEPOINTS and
+			 * events already registered to the channel.
 			 */
+			ret = event_kernel_enable_all_tracepoints(session->kernel_session,
+					kchan, kernel_tracer_fd);
+			break;
+		case LTTNG_KERNEL_ALL:
+			/* Enable syscalls and tracepoints */
 			ret = event_kernel_enable_all(session->kernel_session,
 					kchan, kernel_tracer_fd);
+			break;
+		default:
+			ret = LTTCOMM_KERN_ENABLE_FAIL;
+			goto error;
 		}
-
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}