X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=449f20f47f8616ecc468d3332f0de3e9e2a3f396;hp=3c1c3916e0344a48098fe92e4c771201c356f7a0;hb=2722170124d7942f34b991237874a6d6c17fc421;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377 diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 3c1c3916e..449f20f47 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -27,22 +27,25 @@ #include #include -#include "../cmd.h" -#include "../conf.h" -#include "../utils.h" +#include "../command.h" 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; -static char *opt_cmd_name; static int opt_enable_all; -static pid_t opt_pid; static char *opt_probe; static char *opt_function; static char *opt_function_entry_symbol; static char *opt_channel_name; +#if 0 +/* Not implemented yet */ +static char *opt_cmd_name; +static pid_t opt_pid; +#endif enum { OPT_HELP = 1, @@ -52,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; @@ -64,8 +69,13 @@ static struct poptOption long_options[] = { {"all", 'a', POPT_ARG_VAL, &opt_enable_all, 1, 0, 0}, {"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0}, {"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0}, +#if 0 + /* Not implemented yet */ {"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0}, {"pid", 'p', POPT_ARG_INT, &opt_pid, 0, 0, 0}, +#else + {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0}, +#endif {"tracepoint", 0, POPT_ARG_NONE, 0, OPT_TRACEPOINT, 0, 0}, {"probe", 0, POPT_ARG_STRING, &opt_probe, OPT_PROBE, 0, 0}, {"function", 0, POPT_ARG_STRING, &opt_function, OPT_FUNCTION, 0, 0}, @@ -77,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} }; @@ -89,14 +101,19 @@ 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"); - fprintf(ofp, " -u, --userspace [CMD] Apply for the user-space tracer\n"); +#if 0 + 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 to the user-space tracer\n"); +#endif fprintf(ofp, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); @@ -105,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"); @@ -194,11 +214,22 @@ end: */ 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; + /* Create lttng domain */ + if (opt_kernel) { + dom.type = LTTNG_DOMAIN_KERNEL; + } else if (opt_userspace) { + dom.type = LTTNG_DOMAIN_UST; + } else { + ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); + ret = CMD_ERROR; + goto error; + } + if (opt_channel_name == NULL) { err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME); if (err < 0) { @@ -209,30 +240,6 @@ static int enable_events(char *session_name) 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; - } else if (opt_pid != 0) { - dom.type = LTTNG_DOMAIN_UST_PID; - dom.attr.pid = opt_pid; - DBG("PID %d set to lttng handle", opt_pid); - } else if (opt_userspace && opt_cmd_name == NULL) { - dom.type = LTTNG_DOMAIN_UST; - } else if (opt_userspace && opt_cmd_name != NULL) { - dom.type = LTTNG_DOMAIN_UST_EXEC_NAME; - strncpy(dom.attr.exec_name, opt_cmd_name, NAME_MAX); - } else { - ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); - ret = CMD_NOT_IMPLEMENTED; - goto error; - } - handle = lttng_create_handle(session_name, &dom); if (handle == NULL) { ret = -1; @@ -241,7 +248,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'; @@ -324,15 +330,27 @@ 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 = opt_loglevel_type; + ev.loglevel[0] = '\0'; } 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 DBG("Enabling UST event %s for channel %s", event_name, channel_name); @@ -346,27 +364,34 @@ 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) { + strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN); + ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; + } else { + ev.loglevel[0] = '\0'; + } } 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); } @@ -377,6 +402,9 @@ static int enable_events(char *session_name) end: error: + if (warn) { + ret = CMD_WARNING; + } if (opt_channel_name == NULL) { free(channel_name); } @@ -390,7 +418,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; @@ -403,8 +431,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; @@ -424,9 +451,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; + opt_loglevel = poptGetOptArg(pc); break; + case OPT_LOGLEVEL_ONLY: + opt_loglevel_type = LTTNG_EVENT_LOGLEVEL_ONLY; + opt_loglevel = poptGetOptArg(pc); + break; + case OPT_LIST_OPTIONS: + list_cmd_options(stdout, long_options); + goto end; default: usage(stderr); ret = CMD_UNDEFINED; @@ -438,14 +473,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 { @@ -459,5 +494,6 @@ end: free(session_name); } + poptFreeContext(pc); return ret; }