X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=6fe393fb6ba3641232a311706b1e98cc267694e1;hb=441c16a7f0bbab56a5e783059d0cddab68544a9a;hp=449f20f47f8616ecc468d3332f0de3e9e2a3f396;hpb=2722170124d7942f34b991237874a6d6c17fc421;p=lttng-tools.git diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 449f20f47..6fe393fb6 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"); } /* @@ -209,6 +232,49 @@ end: return ret; } +/* + * Maps loglevel from string to value + */ +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_PROGRAM")) { + return 8; + } else if (!strcmp(str, "TRACE_PROCESS")) { + return 9; + } else if (!strcmp(str, "TRACE_MODULE")) { + return 10; + } else if (!strcmp(str, "TRACE_UNIT")) { + return 11; + } else if (!strcmp(str, "TRACE_FUNCTION")) { + return 12; + } else if (!strcmp(str, "TRACE_DEFAULT")) { + return 13; + } else if (!strcmp(str, "TRACE_VERBOSE")) { + return 14; + } else if (!strcmp(str, "TRACE_DEBUG")) { + return 15; + } else { + return -1; + } +} + /* * Enabling event using the lttng API. */ @@ -219,6 +285,9 @@ static int enable_events(char *session_name) struct lttng_event ev; struct lttng_domain dom; + memset(&ev, 0, sizeof(ev)); + memset(&dom, 0, sizeof(dom)); + /* Create lttng domain */ if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; @@ -251,9 +320,22 @@ 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; + } + } else { + ev.loglevel = -1; + } } ret = lttng_enable_event(handle, &ev, channel_name); @@ -263,8 +345,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 +356,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 +425,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 +435,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 +459,18 @@ 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'; + ev.loglevel = loglevel_str_to_value(opt_loglevel); + if (ev.loglevel == -1) { + ERR("Unknown loglevel %s", opt_loglevel); + ret = -1; + goto error; + } } else { - ev.loglevel[0] = '\0'; + ev.loglevel = -1; } } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); + ret = CMD_ERROR; goto error; } @@ -452,11 +540,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: