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

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 5b844e493..85fd86a08 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -53,8 +53,11 @@ enum {
 	OPT_PROBE,
 	OPT_FUNCTION,
 	OPT_FUNCTION_ENTRY,
+	OPT_SYSCALL,
 };
 
+static struct lttng_handle *handle;
+
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 	{"help",           'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
@@ -70,6 +73,7 @@ static struct poptOption long_options[] = {
 	{"probe",         0,   POPT_ARG_STRING, 0, OPT_PROBE, 0, 0},
 	{"function",       0,   POPT_ARG_STRING, 0, OPT_FUNCTION, 0, 0},
 	{"function:entry", 0,   POPT_ARG_STRING, 0, OPT_FUNCTION_ENTRY, 0, 0},
+	{"syscall",        0,     POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -101,6 +105,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                           decimal (NNN...) or hexadecimal (0xNNN...)\n");
 	fprintf(ofp, "    --function:entry symbol\n");
 	fprintf(ofp, "                           Function tracer event\n");
+	fprintf(ofp, "    --syscall              System call event\n");
 	fprintf(ofp, "    --marker               User-space marker (deprecated)\n");
 	fprintf(ofp, "\n");
 }
@@ -179,7 +184,7 @@ end:
  *
  *  Enabling event using the lttng API.
  */
-static int enable_events(void)
+static int enable_events(char *session_name)
 {
 	int err, ret = CMD_SUCCESS;
 	char *event_name, *channel_name = NULL;
@@ -201,31 +206,45 @@ static int enable_events(void)
 		dom.type = LTTNG_DOMAIN_KERNEL;
 	}
 
-	if (opt_enable_all) {
-		if (set_session_name(opt_session_name) < 0) {
-			ret = CMD_ERROR;
-			goto error;
-		}
+	handle = lttng_create_handle(session_name, &dom);
+	if (handle == NULL) {
+		ret = -1;
+		goto error;
+	}
 
-		if (opt_kernel) {
-			ret = lttng_enable_event(&dom, NULL, channel_name);
-			if (ret == 0) {
-				MSG("All kernel events are enabled in channel %s", channel_name);
+	if (opt_enable_all) {
+		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 */
+			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;
 			}
+			break;
+		default:
+			MSG("Enable all not supported for this instrumentation type.");
 			goto error;
 		}
-
-		/* TODO: User-space tracer */
 	}
 
 	/* Strip event list */
 	event_name = strtok(opt_event_list, ",");
 	while (event_name != NULL) {
-		if (set_session_name(opt_session_name) < 0) {
-			ret = CMD_ERROR;
-			goto error;
-		}
-
 		/* Kernel tracer action */
 		if (opt_kernel) {
 			DBG("Enabling kernel event %s for channel %s",
@@ -260,12 +279,16 @@ static int enable_events(void)
 					LTTNG_SYMBOL_NAME_LEN);
 				ev.attr.ftrace.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 				break;
+			case LTTNG_EVENT_SYSCALL:
+				MSG("per-syscall selection not supported yet. Use \"-a\" for all syscalls.");
+				ret = CMD_NOT_IMPLEMENTED;
+				goto error;
 			default:
 				ret = CMD_NOT_IMPLEMENTED;
 				goto error;
 			}
 
-			ret = lttng_enable_event(&dom, &ev, channel_name);
+			ret = lttng_enable_event(handle, &ev, channel_name);
 			if (ret == 0) {
 				MSG("Kernel event %s created in channel %s", event_name, channel_name);
 			}
@@ -291,6 +314,8 @@ error:
 	if (opt_channel_name == NULL) {
 		free(channel_name);
 	}
+	lttng_destroy_handle(handle);
+
 	return ret;
 }
 
@@ -303,6 +328,7 @@ int cmd_enable_events(int argc, const char **argv)
 {
 	int opt, ret;
 	static poptContext pc;
+	char *session_name = NULL;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -338,6 +364,9 @@ int cmd_enable_events(int argc, const char **argv)
 			opt_event_type = LTTNG_EVENT_FUNCTION_ENTRY;
 			opt_function_entry_symbol = poptGetOptArg(pc);
 			break;
+		case OPT_SYSCALL:
+			opt_event_type = LTTNG_EVENT_SYSCALL;
+			break;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;
@@ -353,8 +382,22 @@ int cmd_enable_events(int argc, const char **argv)
 		goto end;
 	}
 
-	ret = enable_events();
+	if (!opt_session_name) {
+		session_name = get_session_name();
+		if (session_name == NULL) {
+			ret = -1;
+			goto end;
+		}
+	} else {
+		session_name = opt_session_name;
+	}
+
+	ret = enable_events(session_name);
 
 end:
+	if (opt_session_name == NULL) {
+		free(session_name);
+	}
+
 	return ret;
 }