X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_context.c;h=a7ab4268ac5401805d83d675639962d834f0fb50;hb=d16c1a4ce20ed71733c02353383f1a3058fe9ed2;hp=23ae8f2a87ec6f414cf29c6b2b97498ae4176874;hpb=c399183f4b3257c43915f3d81f44befd23165ad9;p=lttng-tools.git diff --git a/src/bin/lttng/commands/add_context.c b/src/bin/lttng/commands/add_context.c index 23ae8f2a8..a7ab4268a 100644 --- a/src/bin/lttng/commands/add_context.c +++ b/src/bin/lttng/commands/add_context.c @@ -37,14 +37,18 @@ static char *opt_channel_name; static char *opt_session_name; static int opt_kernel; static int opt_userspace; +static char *opt_type; +#if 0 +/* Not implemented yet */ static char *opt_cmd_name; static pid_t opt_pid; -static char *opt_type; +#endif enum { OPT_HELP = 1, OPT_TYPE, OPT_USERSPACE, + OPT_LIST_OPTIONS, }; static struct lttng_handle *handle; @@ -138,9 +142,15 @@ static struct poptOption long_options[] = { {"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0}, {"event", 'e', POPT_ARG_STRING, &opt_event_name, 0, 0, 0}, {"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0}, - {"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0}, +#if 0 + /* Not implemented yet */ {"pid", 'p', POPT_ARG_INT, &opt_pid, 0, 0, 0}, + {"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0}, +#else + {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0}, +#endif {"type", 't', POPT_ARG_STRING, &opt_type, OPT_TYPE, 0, 0}, + {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, {0, 0, 0, 0, 0, 0, 0} }; @@ -293,28 +303,35 @@ static void usage(FILE *ofp) { fprintf(ofp, "usage: lttng add-context -t TYPE\n"); fprintf(ofp, "\n"); - fprintf(ofp, "If no event name is given (-e), the context will be added to the channel\n"); fprintf(ofp, "If no channel and no event is given (-c/-e), the context\n"); fprintf(ofp, "will be added to all events and all channels.\n"); + fprintf(ofp, "Otherwise the context will be added only to the channel (-c)\n"); + fprintf(ofp, "and/or event (-e) indicated.\n"); fprintf(ofp, "\n"); fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\n"); - fprintf(ofp, " -s, --session Apply on session name\n"); + fprintf(ofp, " --list-options Simple listing of options\n"); + fprintf(ofp, " -s, --session NAME Apply on session name\n"); fprintf(ofp, " -c, --channel NAME Apply on channel\n"); fprintf(ofp, " -e, --event NAME Apply on event\n"); - fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n"); - fprintf(ofp, " -u, --userspace [CMD] Apply for the user-space tracer\n"); + fprintf(ofp, " -k, --kernel Apply to the kernel 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, " -t, --type TYPE Context type. You can repeat that option on\n"); - fprintf(ofp, " the command line.\n"); + fprintf(ofp, " the command line to specify multiple contexts at once.\n"); + fprintf(ofp, " (--kernel preempts --userspace)\n"); fprintf(ofp, " TYPE can be one of the strings below:\n"); print_ctx_type(ofp); fprintf(ofp, "\n"); fprintf(ofp, "Example:\n"); fprintf(ofp, "This command will add the context information 'prio' and two perf\n" - "counters: hardware branch misses and cache misses, to all events\n" + "counters (hardware branch misses and cache misses), to all events\n" "in the trace data output:\n"); fprintf(ofp, "# lttng add-context -k -t prio -t perf:branch-misses -t perf:cache-misses\n"); fprintf(ofp, "\n"); @@ -344,7 +361,7 @@ end: */ static int add_context(char *session_name) { - int ret = CMD_SUCCESS; + int ret = CMD_SUCCESS, warn = 0; struct lttng_event_context context; struct lttng_domain dom; struct ctx_type *type; @@ -352,24 +369,17 @@ static int add_context(char *session_name) 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) { + } else if (opt_userspace) { 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; + ret = CMD_ERROR; goto error; } handle = lttng_create_handle(session_name, &dom); if (handle == NULL) { - ret = -1; + ret = CMD_ERROR; goto error; } @@ -393,7 +403,8 @@ static int add_context(char *session_name) ret = lttng_add_context(handle, &context, opt_event_name, opt_channel_name); if (ret < 0) { - fprintf(stderr, "%s: ", type->opt->symbol); + ERR("%s: ", type->opt->symbol); + warn = 1; continue; } else { MSG("%s context %s added to %s event in %s", @@ -403,9 +414,18 @@ static int add_context(char *session_name) } } + ret = CMD_SUCCESS; + error: lttng_destroy_handle(handle); + /* + * This means that at least one add_context failed and tells the user to + * look on stderr for error(s). + */ + if (warn) { + ret = CMD_WARNING; + } return ret; } @@ -440,6 +460,11 @@ int cmd_add_context(int argc, const char **argv) ret = -1; goto end; } + + /* + * Look up the index of opt_type in ctx_opts[] first, so we don't + * have to free(type) on failure. + */ index = find_ctx_type_idx(opt_type); if (index < 0) { ERR("Unknown context type %s", opt_type); @@ -454,8 +479,14 @@ int cmd_add_context(int argc, const char **argv) break; case OPT_USERSPACE: opt_userspace = 1; +#if 0 opt_cmd_name = poptGetOptArg(pc); +#endif break; + case OPT_LIST_OPTIONS: + list_cmd_options(stdout, long_options); + ret = CMD_SUCCESS; + goto end; default: usage(stderr); ret = CMD_UNDEFINED;