X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=3bf50fbeaf5c779b58233af5b4bbf4785ac60374;hb=eeac7d463a09ac924c3c98f1fa5fa6c19748b4de;hp=78227be1fdcff05cf2102a468b62404913390d52;hpb=8c9ae521a34f2d83c42ced6b00a599518e8473e8;p=lttng-tools.git

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 78227be1f..3bf50fbea 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -34,10 +34,10 @@
 static char *opt_event_list;
 static int opt_event_type;
 static char *opt_kernel;
-static char *opt_cmd_name;
 static char *opt_session_name;
 static int opt_pid_all;
 static int opt_userspace;
+static char *opt_cmd_name;
 static int opt_enable_all;
 static pid_t opt_pid;
 static char *opt_probe;
@@ -47,13 +47,13 @@ static char *opt_channel_name;
 
 enum {
 	OPT_HELP = 1,
-	OPT_USERSPACE,
 	OPT_TRACEPOINT,
 	OPT_MARKER,
 	OPT_PROBE,
 	OPT_FUNCTION,
 	OPT_FUNCTION_ENTRY,
 	OPT_SYSCALL,
+	OPT_USERSPACE,
 };
 
 static struct lttng_handle *handle;
@@ -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) {
@@ -224,10 +237,8 @@ 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",
-						channel_name);
-			}
+			MSG("All %s tracepoints are enabled in channel %s",
+				opt_kernel ? "kernel" : "UST", channel_name);
 			break;
 		case LTTNG_EVENT_SYSCALL:
 			if (opt_kernel) {
@@ -235,15 +246,18 @@ static int enable_events(char *session_name)
 						channel_name);
 			}
 			break;
+		case LTTNG_EVENT_ALL:
+			MSG("All %s events are enabled in channel %s",
+				opt_kernel ? "kernel" : "UST", channel_name);
+			break;
 		default:
 			/*
-			 * We should not be here since lttng_enable_event should had failed
-			 * on the event type.
+			 * We should not be here since
+			 * lttng_enable_event should have failed on the
+			 * event type.
 			 */
 			goto error;
-
 		}
-
 		goto end;
 	}
 
@@ -260,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:
@@ -299,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;
@@ -340,18 +385,15 @@ 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) {
+		fprintf(stderr, "OPT TEST %d\n", opt);
 		switch (opt) {
 		case OPT_HELP:
 			usage(stderr);
 			ret = CMD_SUCCESS;
 			goto end;
-		case OPT_USERSPACE:
-			opt_userspace = 1;
-			opt_cmd_name = poptGetOptArg(pc);
-			break;
 		case OPT_TRACEPOINT:
 			opt_event_type = LTTNG_EVENT_TRACEPOINT;
 			break;
@@ -373,6 +415,10 @@ int cmd_enable_events(int argc, const char **argv)
 		case OPT_SYSCALL:
 			opt_event_type = LTTNG_EVENT_SYSCALL;
 			break;
+		case OPT_USERSPACE:
+			opt_userspace = 1;
+			opt_cmd_name = poptGetOptArg(pc);
+			break;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;