X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=6e912c11693e70b2fa35f28f45c5359f0b587589;hp=8360821fb09221304b386f3dc45fac19a7107c59;hb=8005f29ac9f079b844b3e6bb0261e19a76ccd4da;hpb=d78d661021eb1c5761c631dbd525697769fe638b diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 8360821fb..6e912c116 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -31,6 +31,8 @@ static char *opt_event_list; static int opt_event_type; +static const char *opt_loglevel; +static int opt_loglevel_type; static int opt_kernel; static char *opt_session_name; static int opt_userspace; @@ -53,7 +55,9 @@ enum { OPT_FUNCTION_ENTRY, OPT_SYSCALL, OPT_USERSPACE, - OPT_TRACEPOINT_LOGLEVEL, + OPT_LOGLEVEL, + OPT_LOGLEVEL_ONLY, + OPT_LIST_OPTIONS, }; static struct lttng_handle *handle; @@ -83,7 +87,9 @@ static struct poptOption long_options[] = { {"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}, + {"loglevel", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL, 0, 0}, + {"loglevel-only", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL_ONLY, 0, 0}, + {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, {0, 0, 0, 0, 0, 0, 0} }; @@ -95,17 +101,18 @@ static void usage(FILE *ofp) fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] [options] [event_options]\n"); fprintf(ofp, "\n"); fprintf(ofp, " -h, --help Show this help\n"); - fprintf(ofp, " -s, --session Apply on session name\n"); - fprintf(ofp, " -c, --channel Apply on this channel\n"); + fprintf(ofp, " --list-options Simple listing of options\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"); @@ -115,7 +122,10 @@ static void usage(FILE *ofp) fprintf(ofp, " e.g.:\n"); fprintf(ofp, " \"*\"\n"); fprintf(ofp, " \"app_component:na*\"\n"); - fprintf(ofp, " --loglevel Tracepoint loglevel\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"); @@ -199,32 +209,76 @@ 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. */ static int enable_events(char *session_name) { - int err, ret = CMD_SUCCESS; + int err, ret = CMD_SUCCESS, warn = 0; char *event_name, *channel_name = NULL; struct lttng_event ev; struct lttng_domain dom; - if (opt_channel_name == NULL) { - err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME); - if (err < 0) { - ret = CMD_FATAL; - goto error; - } - } else { - channel_name = opt_channel_name; - } - - if (opt_kernel && opt_userspace) { - ERR("Can't use -k/--kernel and -u/--userspace together"); - ret = CMD_FATAL; - goto error; - } - /* Create lttng domain */ if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; @@ -232,10 +286,20 @@ static int enable_events(char *session_name) dom.type = LTTNG_DOMAIN_UST; } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); - ret = CMD_NOT_IMPLEMENTED; + ret = CMD_ERROR; goto error; } + if (opt_channel_name == NULL) { + err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME); + if (err < 0) { + ret = CMD_FATAL; + goto error; + } + } else { + channel_name = opt_channel_name; + } + handle = lttng_create_handle(session_name, &dom); if (handle == NULL) { ret = -1; @@ -244,7 +308,6 @@ static int enable_events(char *session_name) if (opt_enable_all) { /* Default setup for enable all */ - if (opt_kernel) { ev.type = opt_event_type; ev.name[0] = '\0'; @@ -327,14 +390,23 @@ static int enable_events(char *session_name) MSG("per-syscall selection not supported yet. Use \"-a\" " "for all syscalls."); default: - ret = CMD_NOT_IMPLEMENTED; + ret = CMD_UNDEFINED; goto error; } + + if (opt_loglevel) { + MSG("Kernel loglevels are not supported."); + ret = CMD_UNDEFINED; + goto error; + } + + /* kernel loglevels not implemented */ + ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; } else if (opt_userspace) { /* User-space tracer action */ #if 0 if (opt_cmd_name != NULL || opt_pid) { MSG("Only supporting tracing all UST processes (-u) for now."); - ret = CMD_NOT_IMPLEMENTED; + ret = CMD_UNDEFINED; goto error; } #endif @@ -351,27 +423,35 @@ static int enable_events(char *session_name) 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: case LTTNG_EVENT_FUNCTION_ENTRY: case LTTNG_EVENT_SYSCALL: default: - ret = CMD_NOT_IMPLEMENTED; + ERR("Event type not available for user-space tracing"); + ret = CMD_UNDEFINED; goto error; } + + 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); + goto error; + } + } } else { ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); goto error; } ret = lttng_enable_event(handle, &ev, channel_name); - if (ret == 0) { + if (ret < 0) { + ERR("Event %s: %s (channel %s, session %s)", event_name, + lttng_strerror(ret), channel_name, session_name); + warn = 1; + } else { MSG("%s event %s created in channel %s", opt_kernel ? "kernel": "UST", event_name, channel_name); } @@ -382,6 +462,9 @@ static int enable_events(char *session_name) end: error: + if (warn) { + ret = CMD_WARNING; + } if (opt_channel_name == NULL) { free(channel_name); } @@ -395,7 +478,7 @@ error: */ int cmd_enable_events(int argc, const char **argv) { - int opt, ret; + int opt, ret = CMD_SUCCESS; static poptContext pc; char *session_name = NULL; @@ -408,8 +491,7 @@ int cmd_enable_events(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stderr); - ret = CMD_SUCCESS; + usage(stdout); goto end; case OPT_TRACEPOINT: opt_event_type = LTTNG_EVENT_TRACEPOINT; @@ -429,9 +511,17 @@ 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; + case OPT_LOGLEVEL: + opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE; + opt_loglevel = poptGetOptArg(pc); break; + case OPT_LOGLEVEL_ONLY: + opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE; + opt_loglevel = poptGetOptArg(pc); + break; + case OPT_LIST_OPTIONS: + list_cmd_options(stdout, long_options); + goto end; default: usage(stderr); ret = CMD_UNDEFINED; @@ -443,14 +533,14 @@ int cmd_enable_events(int argc, const char **argv) if (opt_event_list == NULL && opt_enable_all == 0) { ERR("Missing event name(s).\n"); usage(stderr); - ret = CMD_SUCCESS; + ret = CMD_ERROR; goto end; } if (!opt_session_name) { session_name = get_session_name(); if (session_name == NULL) { - ret = -1; + ret = CMD_ERROR; goto end; } } else { @@ -464,5 +554,6 @@ end: free(session_name); } + poptFreeContext(pc); return ret; }