X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=cb53fb0db96094c9736ae181e3bcc3ce27fcd0a9;hb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;hp=85fd86a08c4b89e27692eacaa736b99c947d84a0;hpb=a54bd42d73836eb9033a31c3f68be5b7e8612dce;p=lttng-tools.git

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 85fd86a08..cb53fb0db 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -201,10 +201,23 @@ static int enable_events(char *session_name)
 		channel_name = opt_channel_name;
 	}
 
+	if (opt_kernel && opt_userspace) {
+		MSG("Choose only one of --kernel or --userspace");
+		ret = CMD_FATAL;
+		goto error;
+	}
 	/* Create lttng domain */
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
 	}
+	if (opt_userspace) {
+		/* TODO
+		 * LTTNG_DOMAIN_UST_EXEC_NAME,
+		 * LTTNG_DOMAIN_UST_PID,
+		 * LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN 
+		 */
+		dom.type = LTTNG_DOMAIN_UST;
+	}
 
 	handle = lttng_create_handle(session_name, &dom);
 	if (handle == NULL) {
@@ -213,33 +226,39 @@ 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;
-			}
-			/* TODO: User-space tracer */
+			MSG("All %s tracepoints are enabled in channel %s",
+				opt_kernel ? "kernel" : "UST", channel_name);
 			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:
+			MSG("All %s events are enabled in channel %s",
+				opt_kernel ? "kernel" : "UST", channel_name);
+			break;
 		default:
-			MSG("Enable all not supported for this instrumentation type.");
+			/*
+			 * We should not be here since
+			 * lttng_enable_event should have failed on the
+			 * event type.
+			 */
 			goto error;
 		}
+		goto end;
 	}
 
 	/* Strip event list */
@@ -255,6 +274,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:
@@ -294,13 +316,41 @@ static int enable_events(char *session_name)
 			}
 		} else if (opt_userspace) {		/* User-space tracer action */
 			/*
-			 * TODO: Waiting on lttng UST 2.0
+			 * TODO: only supporting pid_all tracing for
+			 * now. Should have different domain based on
+			 * opt_pid.
 			 */
-			if (opt_pid_all) {
-			} else if (opt_pid != 0) {
+			if (!opt_pid_all) {
+				MSG("Only supporting tracing all UST processes (-u --all) for now.");
+				ret = CMD_NOT_IMPLEMENTED;
+				goto error;
+			}
+			DBG("Enabling UST event %s for channel %s",
+					event_name, channel_name);
+			/* Copy name and type of the event */
+			strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
+			ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+			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:
+			case LTTNG_EVENT_FUNCTION:
+			case LTTNG_EVENT_FUNCTION_ENTRY:
+			case LTTNG_EVENT_SYSCALL:
+			default:
+				ret = CMD_NOT_IMPLEMENTED;
+				goto error;
+			}
+
+			ret = lttng_enable_event(handle, &ev, channel_name);
+			if (ret == 0) {
+				MSG("UST event %s created in channel %s", event_name, channel_name);
 			}
-			ret = CMD_NOT_IMPLEMENTED;
-			goto error;
 		} else {
 			ERR("Please specify a tracer (--kernel or --userspace)");
 			goto error;
@@ -310,6 +360,7 @@ static int enable_events(char *session_name)
 		event_name = strtok(NULL, ",");
 	}
 
+end:
 error:
 	if (opt_channel_name == NULL) {
 		free(channel_name);
@@ -334,7 +385,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) {