X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=3d2b41c02c6cac1c2afe986722b097e58e07d579;hb=57064adac0e3399dc34d7f6259cb6de5cef6edd4;hp=c7b16488d8b38d69b8152840e27c55124d585be8;hpb=300b8fd5c7921b094f69847164ff58d889f11be6;p=lttng-tools.git diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index c7b16488d..3d2b41c02 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -141,25 +141,27 @@ static void usage(FILE *ofp) 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, " 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_DEBUG_SYSTEM = 7\n"); + fprintf(ofp, " TRACE_DEBUG_PROGRAM = 8\n"); + fprintf(ofp, " TRACE_DEBUG_PROCESS = 9\n"); + fprintf(ofp, " TRACE_DEBUG_MODULE = 10\n"); + fprintf(ofp, " TRACE_DEBUG_UNIT = 11\n"); + fprintf(ofp, " TRACE_DEBUG_FUNCTION = 12\n"); + fprintf(ofp, " TRACE_DEBUG_LINE = 13\n"); + fprintf(ofp, " TRACE_DEBUG = 14\n"); + fprintf(ofp, " (shortcuts such as \"system\" are allowed)\n"); fprintf(ofp, "\n"); } @@ -231,60 +233,49 @@ 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) +int loglevel_str_to_value(const char *inputstr) { - 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; + int i = 0; + char str[LTTNG_SYMBOL_NAME_LEN]; + + while (inputstr[i] != '\0' && i < LTTNG_SYMBOL_NAME_LEN) { + str[i] = toupper(inputstr[i]); + i++; + } + str[i] = '\0'; + if (!strcmp(str, "TRACE_EMERG") || !strcmp(str, "EMERG")) { + return LTTNG_LOGLEVEL_EMERG; + } else if (!strcmp(str, "TRACE_ALERT") || !strcmp(str, "ALERT")) { + return LTTNG_LOGLEVEL_ALERT; + } else if (!strcmp(str, "TRACE_CRIT") || !strcmp(str, "CRIT")) { + return LTTNG_LOGLEVEL_CRIT; + } else if (!strcmp(str, "TRACE_ERR") || !strcmp(str, "ERR")) { + return LTTNG_LOGLEVEL_ERR; + } else if (!strcmp(str, "TRACE_WARNING") || !strcmp(str, "WARNING")) { + return LTTNG_LOGLEVEL_WARNING; + } else if (!strcmp(str, "TRACE_NOTICE") || !strcmp(str, "NOTICE")) { + return LTTNG_LOGLEVEL_NOTICE; + } else if (!strcmp(str, "TRACE_INFO") || !strcmp(str, "INFO")) { + return LTTNG_LOGLEVEL_INFO; + } else if (!strcmp(str, "TRACE_DEBUG_SYSTEM") || !strcmp(str, "DEBUG_SYSTEM") || !strcmp(str, "SYSTEM")) { + return LTTNG_LOGLEVEL_DEBUG_SYSTEM; + } else if (!strcmp(str, "TRACE_DEBUG_PROGRAM") || !strcmp(str, "DEBUG_PROGRAM") || !strcmp(str, "PROGRAM")) { + return LTTNG_LOGLEVEL_DEBUG_PROGRAM; + } else if (!strcmp(str, "TRACE_DEBUG_PROCESS") || !strcmp(str, "DEBUG_PROCESS") || !strcmp(str, "PROCESS")) { + return LTTNG_LOGLEVEL_DEBUG_PROCESS; + } else if (!strcmp(str, "TRACE_DEBUG_MODULE") || !strcmp(str, "DEBUG_MODULE") || !strcmp(str, "MODULE")) { + return LTTNG_LOGLEVEL_DEBUG_MODULE; + } else if (!strcmp(str, "TRACE_DEBUG_UNIT") || !strcmp(str, "DEBUG_UNIT") || !strcmp(str, "UNIT")) { + return LTTNG_LOGLEVEL_DEBUG_UNIT; + } else if (!strcmp(str, "TRACE_DEBUG_FUNCTION") || !strcmp(str, "DEBUG_FUNCTION") || !strcmp(str, "FUNCTION")) { + return LTTNG_LOGLEVEL_DEBUG_FUNCTION; + } else if (!strcmp(str, "TRACE_DEBUG_LINE") || !strcmp(str, "DEBUG_LINE") || !strcmp(str, "LINE")) { + return LTTNG_LOGLEVEL_DEBUG_LINE; + } else if (!strcmp(str, "TRACE_DEBUG") || !strcmp(str, "DEBUG")) { + return LTTNG_LOGLEVEL_DEBUG; } else { return -1; } @@ -300,6 +291,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; @@ -345,6 +339,8 @@ static int enable_events(char *session_name) ret = -1; goto error; } + } else { + ev.loglevel = -1; } } @@ -355,9 +351,15 @@ static int enable_events(char *session_name) switch (opt_event_type) { case LTTNG_EVENT_TRACEPOINT: - MSG("All %s tracepoints are enabled in channel %s for loglevel %s", - opt_kernel ? "kernel" : "UST", channel_name, - opt_loglevel ? : ""); + if (opt_loglevel) { + MSG("All %s tracepoints are enabled in channel %s for loglevel %s", + opt_kernel ? "kernel" : "UST", channel_name, + opt_loglevel); + } else { + MSG("All %s tracepoints are enabled in channel %s", + opt_kernel ? "kernel" : "UST", channel_name); + + } break; case LTTNG_EVENT_SYSCALL: if (opt_kernel) { @@ -366,9 +368,14 @@ static int enable_events(char *session_name) } break; case LTTNG_EVENT_ALL: - MSG("All %s events are enabled in channel %s for loglevel %s", - opt_kernel ? "kernel" : "UST", channel_name, - opt_loglevel ? : ""); + if (opt_loglevel) { + MSG("All %s events are enabled in channel %s for loglevel %s", + opt_kernel ? "kernel" : "UST", channel_name, + opt_loglevel); + } else { + MSG("All %s events are enabled in channel %s", + opt_kernel ? "kernel" : "UST", channel_name); + } break; default: /* @@ -475,6 +482,8 @@ static int enable_events(char *session_name) ret = -1; goto error; } + } else { + ev.loglevel = -1; } } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");