X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=fbcd40dafac36d388e79fa2bc6f34d3194bac468;hp=78227be1fdcff05cf2102a468b62404913390d52;hb=7a3d132871a4414b6cd232e7f41e6a1f50d9bf16;hpb=cd84aa763efa60969f15757d46a09a884ea97fc8

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 78227be1f..fbcd40daf 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -225,7 +225,7 @@ static int enable_events(char *session_name)
 		switch (opt_event_type) {
 		case LTTNG_EVENT_TRACEPOINT:
 			if (opt_kernel) {
-				MSG("All kernel events are enabled in channel %s",
+				MSG("All kernel tracepoints are enabled in channel %s",
 						channel_name);
 			}
 			break;
@@ -235,6 +235,12 @@ static int enable_events(char *session_name)
 						channel_name);
 			}
 			break;
+		case LTTNG_EVENT_ALL:
+			if (opt_kernel) {
+				MSG("All kernel events are enabled in channel %s",
+						channel_name);
+			}
+			break;
 		default:
 			/*
 			 * We should not be here since lttng_enable_event should had failed
@@ -260,6 +266,9 @@ static int enable_events(char *session_name)
 			ev.type = opt_event_type;
 
 			switch (opt_event_type) {
+			case LTTNG_EVENT_ALL:	/* Default behavior is tracepoint */
+				ev.type = LTTNG_EVENT_TRACEPOINT;
+				/* Fall-through */
 			case LTTNG_EVENT_TRACEPOINT:
 				break;
 			case LTTNG_EVENT_PROBE:
@@ -340,7 +349,7 @@ int cmd_enable_events(int argc, const char **argv)
 	poptReadDefaultConfig(pc, 0);
 
 	/* Default event type */
-	opt_event_type = LTTNG_EVENT_TRACEPOINT;
+	opt_event_type = LTTNG_EVENT_ALL;
 
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {