X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Fcommands%2Fenable_events.c;h=45cef9f60c7a6b55cd76c3ad7dc6379b9e951a2e;hp=dd1a049288c55807ce682fa0faf406d67797a07b;hb=e4baff1ed855ca743e95068ca6449fd906d2d833;hpb=7ebae5217b0b2d8cb897065224a326ccccbce7ac

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index dd1a04928..45cef9f60 100644
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -48,12 +48,12 @@ static char *opt_channel_name;
 enum {
 	OPT_HELP = 1,
 	OPT_TRACEPOINT,
-	OPT_MARKER,
 	OPT_PROBE,
 	OPT_FUNCTION,
 	OPT_FUNCTION_ENTRY,
 	OPT_SYSCALL,
 	OPT_USERSPACE,
+	OPT_TRACEPOINT_LOGLEVEL,
 };
 
 static struct lttng_handle *handle;
@@ -69,11 +69,17 @@ static struct poptOption long_options[] = {
 	{"all",            0,   POPT_ARG_VAL, &opt_pid_all, 1, 0, 0},
 	{"pid",            'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
 	{"tracepoint",     0,   POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0},
-	{"marker",         0,   POPT_ARG_NONE, 0, OPT_MARKER, 0, 0},
 	{"probe",          0,   POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0},
 	{"function",       0,   POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0},
+#if 0
+	/*
+	 * Currently removed from lttng kernel tracer. Removed from
+	 * lttng UI to discourage its use.
+	 */
 	{"function:entry", 0,   POPT_ARG_STRING, &opt_function_entry_symbol, OPT_FUNCTION_ENTRY, 0, 0},
+#endif
 	{"syscall",        0,   POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
+	{"loglevel",     0,     POPT_ARG_NONE, 0, OPT_TRACEPOINT_LOGLEVEL, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -95,6 +101,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Event options:\n");
 	fprintf(ofp, "    --tracepoint           Tracepoint event (default)\n");
+	fprintf(ofp, "    --loglevel             Tracepoint loglevel\n");
 	fprintf(ofp, "    --probe [addr | symbol | symbol+offset]\n");
 	fprintf(ofp, "                           Dynamic probe.\n");
 	fprintf(ofp, "                           Addr and offset can be octal (0NNN...),\n");
@@ -103,10 +110,11 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "                           Dynamic function entry/return probe.\n");
 	fprintf(ofp, "                           Addr and offset can be octal (0NNN...),\n");
 	fprintf(ofp, "                           decimal (NNN...) or hexadecimal (0xNNN...)\n");
+#if 0
 	fprintf(ofp, "    --function:entry symbol\n");
 	fprintf(ofp, "                           Function tracer event\n");
+#endif
 	fprintf(ofp, "    --syscall              System call event\n");
-	fprintf(ofp, "    --marker               User-space marker (deprecated)\n");
 	fprintf(ofp, "\n");
 }
 
@@ -327,16 +335,21 @@ static int enable_events(char *session_name)
 			}
 			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:
+				/* Copy name and type of the event */
+				ev.type = LTTNG_EVENT_TRACEPOINT;
+				strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
+				ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+				break;
+			case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+				/* Copy name and type of the event */
+				ev.type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
+				strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN);
+				ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 				break;
 			case LTTNG_EVENT_PROBE:
 			case LTTNG_EVENT_FUNCTION:
@@ -396,9 +409,6 @@ int cmd_enable_events(int argc, const char **argv)
 		case OPT_TRACEPOINT:
 			opt_event_type = LTTNG_EVENT_TRACEPOINT;
 			break;
-		case OPT_MARKER:
-			ret = CMD_NOT_IMPLEMENTED;
-			goto end;
 		case OPT_PROBE:
 			opt_event_type = LTTNG_EVENT_PROBE;
 			break;
@@ -414,6 +424,9 @@ int cmd_enable_events(int argc, const char **argv)
 		case OPT_USERSPACE:
 			opt_userspace = 1;
 			break;
+		case OPT_TRACEPOINT_LOGLEVEL:
+			opt_event_type = LTTNG_EVENT_TRACEPOINT_LOGLEVEL;
+			break;
 		default:
 			usage(stderr);
 			ret = CMD_UNDEFINED;