X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=b523960c33063be98e5bdf35fc9359fcdf76835f;hp=9c34d2c62377ab66c02c9d4b766f01b6cff57eca;hb=d686b40f66ea5df5ac0b9405991bbc33348b0a88;hpb=2ef84c95c5158ce40e77229fb5705524ff22be7b

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 9c34d2c62..b523960c3 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -143,13 +143,11 @@ static int process_client_opt(void)
 			}
 		}
 
-		if (opt_event_list != NULL) {
+		if (opt_event_list != NULL || opt_enable_all_event) {
 			ret = process_opt_kernel_event();
 			if (ret < 0) {
 				goto end;
 			}
-		} else {
-			// Enable all events
 		}
 
 		if (auto_trace || opt_start_trace) {
@@ -308,6 +306,17 @@ static int process_opt_kernel_event(void)
 	int ret;
 	char *event_name;
 
+	if (opt_enable_all_event) {
+		ret = lttng_kernel_enable_event(NULL);
+		if (ret < 0) {
+			ERR("%s", lttng_get_readable_code(ret));
+		} else {
+			MSG("All kernel event enabled");
+		}
+
+		goto end;
+	}
+
 	event_name = strtok(opt_event_list, ",");
 	while (event_name != NULL) {
 		DBG("Enabling kernel event %s", event_name);
@@ -321,6 +330,7 @@ static int process_opt_kernel_event(void)
 		event_name = strtok(NULL, ",");
 	}
 
+end:
 	return 0;
 }
 
@@ -621,7 +631,7 @@ static int validate_options(void)
 	}
 
 	/* If start trace, auto start tracing */
-	if (opt_start_trace || opt_event_list != NULL) {
+	if (opt_start_trace || opt_event_list != NULL || opt_enable_all_event) {
 		DBG("Requesting auto tracing");
 		auto_trace = 1;
 	}