X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=lttng%2Fcommands%2Fenable_events.c;h=fbcd40dafac36d388e79fa2bc6f34d3194bac468;hb=7a3d132871a4414b6cd232e7f41e6a1f50d9bf16;hp=85fd86a08c4b89e27692eacaa736b99c947d84a0;hpb=a54bd42d73836eb9033a31c3f68be5b7e8612dce;p=lttng-tools.git

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 85fd86a08..fbcd40daf 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -213,33 +213,44 @@ static int enable_events(char *session_name)
 	}
 
 	if (opt_enable_all) {
+		/* Default setup for enable all */
+		ev.name[0] = '\0';
+		ev.type = opt_event_type;
+
+		ret = lttng_enable_event(handle, &ev, channel_name);
+		if (ret < 0) {
+			goto error;
+		}
+
 		switch (opt_event_type) {
 		case LTTNG_EVENT_TRACEPOINT:
 			if (opt_kernel) {
-				ret = lttng_enable_event(handle, NULL, channel_name);
-				if (ret == 0) {
-					MSG("All kernel events are enabled in channel %s", channel_name);
-				}
-				goto error;
+				MSG("All kernel tracepoints are enabled in channel %s",
+						channel_name);
 			}
-			/* TODO: User-space tracer */
 			break;
 		case LTTNG_EVENT_SYSCALL:
 			if (opt_kernel) {
-				ev.name[0] = '\0';
-				ev.type = opt_event_type;
-
-				ret = lttng_enable_event(handle, &ev, channel_name);
-				if (ret == 0) {
-					MSG("All kernel system calls are enabled in channel %s", channel_name);
-				}
-				goto error;
+				MSG("All kernel system calls are enabled in channel %s",
+						channel_name);
+			}
+			break;
+		case LTTNG_EVENT_ALL:
+			if (opt_kernel) {
+				MSG("All kernel events are enabled in channel %s",
+						channel_name);
 			}
 			break;
 		default:
-			MSG("Enable all not supported for this instrumentation type.");
+			/*
+			 * We should not be here since lttng_enable_event should had failed
+			 * on the event type.
+			 */
 			goto error;
+
 		}
+
+		goto end;
 	}
 
 	/* Strip event list */
@@ -255,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:
@@ -310,6 +324,7 @@ static int enable_events(char *session_name)
 		event_name = strtok(NULL, ",");
 	}
 
+end:
 error:
 	if (opt_channel_name == NULL) {
 		free(channel_name);
@@ -334,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) {