X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=6e912c11693e70b2fa35f28f45c5359f0b587589;hb=8005f29ac9f079b844b3e6bb0261e19a76ccd4da;hp=0fa3e916c835b48e2d9228ac8c86ee1e0e4a5dcf;hpb=dad47fc4c65ec0acbfedc676895833b465d25cd6;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 0fa3e916c..6e912c116 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -102,17 +102,17 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "\n");
 	fprintf(ofp, "  -h, --help               Show this help\n");
 	fprintf(ofp, "      --list-options       Simple listing of options\n");
-	fprintf(ofp, "  -s, --session            Apply on session name\n");
-	fprintf(ofp, "  -c, --channel            Apply on this channel\n");
+	fprintf(ofp, "  -s, --session            Apply to session name\n");
+	fprintf(ofp, "  -c, --channel            Apply to this channel\n");
 	fprintf(ofp, "  -a, --all                Enable all tracepoints\n");
 	fprintf(ofp, "  -k, --kernel             Apply for the kernel tracer\n");
 #if 0
-	fprintf(ofp, "  -u, --userspace [CMD]    Apply for the user-space tracer\n");
+	fprintf(ofp, "  -u, --userspace [CMD]    Apply to the user-space tracer\n");
 	fprintf(ofp, "                           If no CMD, the domain used is UST global\n");
 	fprintf(ofp, "                           or else the domain is UST EXEC_NAME\n");
 	fprintf(ofp, "  -p, --pid PID            If -u, apply to specific PID (domain: UST PID)\n");
 #else
-	fprintf(ofp, "  -u, --userspace          Apply for the user-space tracer\n");
+	fprintf(ofp, "  -u, --userspace          Apply to the user-space tracer\n");
 #endif
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Event options:\n");
@@ -209,32 +209,76 @@ end:
 	return ret;
 }
 
+/*
+ * Maps this from string to value
+ *
+ * TRACE_EMERG = 0,
+ * TRACE_ALERT = 1,
+ * TRACE_CRIT = 2,
+ * TRACE_ERR = 3,
+ * TRACE_WARNING = 4,
+ * TRACE_NOTICE = 5,
+ * TRACE_INFO = 6,
+ * TRACE_SYSTEM = 7,
+ * TRACE_PROCESS = 8,
+ * TRACE_MODULE = 9,
+ * TRACE_UNIT = 10,
+ * TRACE_CLASS = 11,
+ * TRACE_OBJECT = 12,
+ * TRACE_FUNCTION = 13,
+ * TRACE_PRINTF = 14,
+ * TRACE_DEBUG = 15,
+ */
+static
+int loglevel_str_to_value(const char *str)
+{
+	if (!strcmp(str, "TRACE_EMERG")) {
+		return 0;
+	} else if (!strcmp(str, "TRACE_ALERT")) {
+		return 1;
+	} else if (!strcmp(str, "TRACE_CRIT")) {
+		return 2;
+	} else if (!strcmp(str, "TRACE_ERR")) {
+		return 3;
+	} else if (!strcmp(str, "TRACE_WARNING")) {
+		return 4;
+	} else if (!strcmp(str, "TRACE_NOTICE")) {
+		return 5;
+	} else if (!strcmp(str, "TRACE_INFO")) {
+		return 6;
+	} else if (!strcmp(str, "TRACE_SYSTEM")) {
+		return 7;
+	} else if (!strcmp(str, "TRACE_PROCESS")) {
+		return 8;
+	} else if (!strcmp(str, "TRACE_MODULE")) {
+		return 9;
+	} else if (!strcmp(str, "TRACE_UNIT")) {
+		return 10;
+	} else if (!strcmp(str, "TRACE_CLASS")) {
+		return 11;
+	} else if (!strcmp(str, "TRACE_OBJECT")) {
+		return 12;
+	} else if (!strcmp(str, "TRACE_FUNCTION")) {
+		return 13;
+	} else if (!strcmp(str, "TRACE_PRINTF")) {
+		return 14;
+	} else if (!strcmp(str, "TRACE_DEBUG")) {
+		return 15;
+	} else {
+		return -1;
+	}
+}
+
 /*
  * Enabling event using the lttng API.
  */
 static int enable_events(char *session_name)
 {
-	int err, ret = CMD_SUCCESS;
+	int err, ret = CMD_SUCCESS, warn = 0;
 	char *event_name, *channel_name = NULL;
 	struct lttng_event ev;
 	struct lttng_domain dom;
 
-	if (opt_channel_name == NULL) {
-		err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
-		if (err < 0) {
-			ret = CMD_FATAL;
-			goto error;
-		}
-	} else {
-		channel_name = opt_channel_name;
-	}
-
-	if (opt_kernel && opt_userspace) {
-		ERR("Can't use -k/--kernel and -u/--userspace together");
-		ret = CMD_FATAL;
-		goto error;
-	}
-
 	/* Create lttng domain */
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
@@ -246,6 +290,16 @@ static int enable_events(char *session_name)
 		goto error;
 	}
 
+	if (opt_channel_name == NULL) {
+		err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
+		if (err < 0) {
+			ret = CMD_FATAL;
+			goto error;
+		}
+	} else {
+		channel_name = opt_channel_name;
+	}
+
 	handle = lttng_create_handle(session_name, &dom);
 	if (handle == NULL) {
 		ret = -1;
@@ -254,7 +308,6 @@ static int enable_events(char *session_name)
 
 	if (opt_enable_all) {
 		/* Default setup for enable all */
-
 		if (opt_kernel) {
 			ev.type = opt_event_type;
 			ev.name[0] = '\0';
@@ -341,15 +394,14 @@ static int enable_events(char *session_name)
 				goto error;
 			}
 
-			if (opt_loglevel[0] != '\0') {
+			if (opt_loglevel) {
 				MSG("Kernel loglevels are not supported.");
 				ret = CMD_UNDEFINED;
 				goto error;
 			}
 
 			/* kernel loglevels not implemented */
-			ev.loglevel_type = opt_loglevel_type;
-			ev.loglevel[0] = '\0';
+			ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 		} else if (opt_userspace) {		/* User-space tracer action */
 #if 0
 			if (opt_cmd_name != NULL || opt_pid) {
@@ -376,20 +428,30 @@ static int enable_events(char *session_name)
 			case LTTNG_EVENT_FUNCTION_ENTRY:
 			case LTTNG_EVENT_SYSCALL:
 			default:
+				ERR("Event type not available for user-space tracing");
 				ret = CMD_UNDEFINED;
 				goto error;
 			}
 
 			ev.loglevel_type = opt_loglevel_type;
-			strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN);
-			ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+			if (opt_loglevel) {
+				ev.loglevel = loglevel_str_to_value(opt_loglevel);
+				if (ev.loglevel == -1) {
+					ERR("Unknown loglevel %s", opt_loglevel);
+					goto error;
+				}
+			}
 		} else {
 			ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
 			goto error;
 		}
 
 		ret = lttng_enable_event(handle, &ev, channel_name);
-		if (ret == 0) {
+		if (ret < 0) {
+			ERR("Event %s: %s (channel %s, session %s)", event_name,
+					lttng_strerror(ret), channel_name, session_name);
+			warn = 1;
+		} else {
 			MSG("%s event %s created in channel %s",
 					opt_kernel ? "kernel": "UST", event_name, channel_name);
 		}
@@ -400,6 +462,9 @@ static int enable_events(char *session_name)
 
 end:
 error:
+	if (warn) {
+		ret = CMD_WARNING;
+	}
 	if (opt_channel_name == NULL) {
 		free(channel_name);
 	}
@@ -413,7 +478,7 @@ error:
  */
 int cmd_enable_events(int argc, const char **argv)
 {
-	int opt, ret;
+	int opt, ret = CMD_SUCCESS;
 	static poptContext pc;
 	char *session_name = NULL;
 
@@ -426,8 +491,7 @@ int cmd_enable_events(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stderr);
-			ret = CMD_SUCCESS;
+			usage(stdout);
 			goto end;
 		case OPT_TRACEPOINT:
 			opt_event_type = LTTNG_EVENT_TRACEPOINT;
@@ -448,16 +512,15 @@ int cmd_enable_events(int argc, const char **argv)
 			opt_userspace = 1;
 			break;
 		case OPT_LOGLEVEL:
-			opt_loglevel_type = LTTNG_EVENT_LOGLEVEL;
+			opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
 			opt_loglevel = poptGetOptArg(pc);
 			break;
 		case OPT_LOGLEVEL_ONLY:
-			opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_ONLY;
+			opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
 			opt_loglevel = poptGetOptArg(pc);
 			break;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
 			usage(stderr);
@@ -470,14 +533,14 @@ int cmd_enable_events(int argc, const char **argv)
 	if (opt_event_list == NULL && opt_enable_all == 0) {
 		ERR("Missing event name(s).\n");
 		usage(stderr);
-		ret = CMD_SUCCESS;
+		ret = CMD_ERROR;
 		goto end;
 	}
 
 	if (!opt_session_name) {
 		session_name = get_session_name();
 		if (session_name == NULL) {
-			ret = -1;
+			ret = CMD_ERROR;
 			goto end;
 		}
 	} else {
@@ -491,5 +554,6 @@ end:
 		free(session_name);
 	}
 
+	poptFreeContext(pc);
 	return ret;
 }