X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=db0597dfbf1617cd1521931549e57e1680595e6e;hb=b903e1f1807b150acb4f26508c0087bb1ea79c39;hp=6e912c11693e70b2fa35f28f45c5359f0b587589;hpb=8005f29ac9f079b844b3e6bb0261e19a76ccd4da;p=lttng-tools.git diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 6e912c116..db0597dfb 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -122,10 +122,6 @@ static void usage(FILE *ofp) fprintf(ofp, " e.g.:\n"); fprintf(ofp, " \"*\"\n"); fprintf(ofp, " \"app_component:na*\"\n"); - fprintf(ofp, " --loglevel name\n"); - fprintf(ofp, " Tracepoint loglevel (range: 0 to loglevel)\n"); - fprintf(ofp, " --loglevel-only name\n"); - fprintf(ofp, " Tracepoint loglevel (only this 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"); @@ -140,6 +136,33 @@ static void usage(FILE *ofp) #endif fprintf(ofp, " --syscall System call event\n"); fprintf(ofp, "\n"); + fprintf(ofp, " --loglevel name\n"); + fprintf(ofp, " Tracepoint loglevel range from 0 to loglevel\n"); + fprintf(ofp, " --loglevel-only name\n"); + fprintf(ofp, " Tracepoint loglevel (only this loglevel)\n"); + fprintf(ofp, "\n"); + fprintf(ofp, " The loglevel or loglevel-only options should be\n"); + fprintf(ofp, " combined with a tracepoint name or tracepoint\n"); + fprintf(ofp, " wildcard.\n"); + fprintf(ofp, " Available loglevels:\n"); + fprintf(ofp, " (higher value is more verbose)\n"); + fprintf(ofp, " TRACE_EMERG = 0\n"); + fprintf(ofp, " TRACE_ALERT = 1\n"); + fprintf(ofp, " TRACE_CRIT = 2\n"); + fprintf(ofp, " TRACE_ERR = 3\n"); + fprintf(ofp, " TRACE_WARNING = 4\n"); + fprintf(ofp, " TRACE_NOTICE = 5\n"); + fprintf(ofp, " TRACE_INFO = 6\n"); + fprintf(ofp, " TRACE_SYSTEM = 7\n"); + fprintf(ofp, " TRACE_PROGRAM = 8\n"); + fprintf(ofp, " TRACE_PROCESS = 9\n"); + fprintf(ofp, " TRACE_MODULE = 10\n"); + fprintf(ofp, " TRACE_UNIT = 11\n"); + fprintf(ofp, " TRACE_FUNCTION = 12\n"); + fprintf(ofp, " TRACE_DEFAULT = 13\n"); + fprintf(ofp, " TRACE_VERBOSE = 14\n"); + fprintf(ofp, " TRACE_DEBUG = 15\n"); + fprintf(ofp, "\n"); } /* @@ -210,24 +233,7 @@ end: } /* - * 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, + * Maps loglevel from string to value */ static int loglevel_str_to_value(const char *str) @@ -248,19 +254,19 @@ int loglevel_str_to_value(const char *str) return 6; } else if (!strcmp(str, "TRACE_SYSTEM")) { return 7; - } else if (!strcmp(str, "TRACE_PROCESS")) { + } else if (!strcmp(str, "TRACE_PROGRAM")) { return 8; - } else if (!strcmp(str, "TRACE_MODULE")) { + } else if (!strcmp(str, "TRACE_PROCESS")) { return 9; - } else if (!strcmp(str, "TRACE_UNIT")) { + } else if (!strcmp(str, "TRACE_MODULE")) { return 10; - } else if (!strcmp(str, "TRACE_CLASS")) { + } else if (!strcmp(str, "TRACE_UNIT")) { return 11; - } else if (!strcmp(str, "TRACE_OBJECT")) { - return 12; } else if (!strcmp(str, "TRACE_FUNCTION")) { + return 12; + } else if (!strcmp(str, "TRACE_DEFAULT")) { return 13; - } else if (!strcmp(str, "TRACE_PRINTF")) { + } else if (!strcmp(str, "TRACE_VERBOSE")) { return 14; } else if (!strcmp(str, "TRACE_DEBUG")) { return 15; @@ -311,9 +317,20 @@ static int enable_events(char *session_name) if (opt_kernel) { ev.type = opt_event_type; ev.name[0] = '\0'; + /* kernel loglevels not implemented */ + ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; } else { ev.type = LTTNG_EVENT_TRACEPOINT; strcpy(ev.name, "*"); + ev.loglevel_type = opt_loglevel_type; + if (opt_loglevel) { + ev.loglevel = loglevel_str_to_value(opt_loglevel); + if (ev.loglevel == -1) { + ERR("Unknown loglevel %s", opt_loglevel); + ret = -1; + goto error; + } + } } ret = lttng_enable_event(handle, &ev, channel_name); @@ -323,8 +340,9 @@ static int enable_events(char *session_name) switch (opt_event_type) { case LTTNG_EVENT_TRACEPOINT: - MSG("All %s tracepoints are enabled in channel %s", - opt_kernel ? "kernel" : "UST", channel_name); + MSG("All %s tracepoints are enabled in channel %s for loglevel %s", + opt_kernel ? "kernel" : "UST", channel_name, + opt_loglevel ? : ""); break; case LTTNG_EVENT_SYSCALL: if (opt_kernel) { @@ -333,8 +351,9 @@ static int enable_events(char *session_name) } break; case LTTNG_EVENT_ALL: - MSG("All %s events are enabled in channel %s", - opt_kernel ? "kernel" : "UST", channel_name); + MSG("All %s events are enabled in channel %s for loglevel %s", + opt_kernel ? "kernel" : "UST", channel_name, + opt_loglevel ? : ""); break; default: /* @@ -411,8 +430,8 @@ static int enable_events(char *session_name) } #endif - DBG("Enabling UST event %s for channel %s", event_name, - channel_name); + DBG("Enabling UST event %s for channel %s, loglevel %s", event_name, + channel_name, opt_loglevel ? : ""); switch (opt_event_type) { case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ @@ -438,11 +457,13 @@ static int enable_events(char *session_name) ev.loglevel = loglevel_str_to_value(opt_loglevel); if (ev.loglevel == -1) { ERR("Unknown loglevel %s", opt_loglevel); + ret = -1; goto error; } } } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); + ret = CMD_ERROR; goto error; }