X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=c7b16488d8b38d69b8152840e27c55124d585be8;hp=125c40fe0bd1c06d3e1409098b38bb5017ac8e88;hb=300b8fd5c7921b094f69847164ff58d889f11be6;hpb=cc62c0c06bbfb22885debcaba1164e31cfa4f87b diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 125c40fe0..c7b16488d 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"); @@ -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,31 @@ 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 combined\n"); + fprintf(ofp, " with a tracepoint name (or tracepoint wildcard).\n"); + fprintf(ofp, " Available loglevels: (higher value means 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_PROCESS = 8\n"); + fprintf(ofp, " TRACE_MODULE = 9\n"); + fprintf(ofp, " TRACE_UNIT = 10\n"); + fprintf(ofp, " TRACE_CLASS = 11\n"); + fprintf(ofp, " TRACE_OBJECT = 12\n"); + fprintf(ofp, " TRACE_FUNCTION = 13\n"); + fprintf(ofp, " TRACE_PRINTF = 14\n"); + fprintf(ofp, " TRACE_DEBUG = 15\n"); + fprintf(ofp, "\n"); } /* @@ -209,6 +230,66 @@ 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. */ @@ -251,9 +332,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); @@ -263,8 +355,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) { @@ -273,8 +366,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: /* @@ -341,8 +435,7 @@ static int enable_events(char *session_name) } /* 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) { @@ -352,8 +445,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 */ @@ -376,13 +469,16 @@ static int enable_events(char *session_name) ev.loglevel_type = opt_loglevel_type; if (opt_loglevel) { - strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN); - ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; - } else { - ev.loglevel[0] = '\0'; + 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; } @@ -452,11 +548,11 @@ 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: