X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=1a53448c647ebd8469871b916258726649a78c5b;hp=de1796ad8ed0e7fa8f6fe06d363c7ad33787e8f0;hb=025faf73cdb6942ebf437dc4c4f6631f0134b128;hpb=919e300c183678cbaafaa473e9687afeb80995c9 diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index de1796ad8..1a53448c6 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -71,13 +71,7 @@ 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}, @@ -101,22 +95,16 @@ static struct poptOption long_options[] = { */ static void usage(FILE *ofp) { - fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] [options] [event_options]\n"); + fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] [-k|-u] [OPTIONS] \n"); fprintf(ofp, "\n"); + fprintf(ofp, "Options:\n"); fprintf(ofp, " -h, --help Show this help\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, " -s, --session NAME Apply to session name\n"); + fprintf(ofp, " -c, --channel NAME Apply to this channel\n"); fprintf(ofp, " -a, --all Enable all tracepoints and syscalls\n"); fprintf(ofp, " -k, --kernel Apply for 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, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); @@ -172,7 +160,22 @@ static void usage(FILE *ofp) fprintf(ofp, " a given event within a session.\n"); fprintf(ofp, " Filter only allowed when enabling\n"); fprintf(ofp, " events within a session before tracing\n"); - fprintf(ofp, " is started.\n"); + fprintf(ofp, " is started. If the filter fails to link\n"); + fprintf(ofp, " with the event within the traced domain,\n"); + fprintf(ofp, " the event will be discarded. Currently,\n"); + fprintf(ofp, " filter is only implemented for the user-space\n"); + fprintf(ofp, " tracer.\n"); + fprintf(ofp, " Expression examples:.\n"); + fprintf(ofp, " \n"); + fprintf(ofp, " 'intfield > 500 && intfield < 503'\n"); + fprintf(ofp, " '(stringfield == \"test\" || intfield != 10) && intfield > 33'\n"); + fprintf(ofp, " 'doublefield > 1.1 && intfield < 5.3'\n"); + fprintf(ofp, " \n"); + fprintf(ofp, " Wildcards are allowed at the end of strings:\n"); + fprintf(ofp, " 'seqfield1 == \"te*\"'\n"); + fprintf(ofp, " In string literals, the escape character is '\\'.\n"); + fprintf(ofp, " Use '\\*' for the '*' character, and '\\\\' for\n"); + fprintf(ofp, " the '\\' character.\n"); fprintf(ofp, "\n"); } @@ -355,7 +358,7 @@ static int enable_events(char *session_name) ev.loglevel = loglevel_str_to_value(opt_loglevel); if (ev.loglevel == -1) { ERR("Unknown loglevel %s", opt_loglevel); - ret = -1; + ret = -LTTNG_ERR_INVALID; goto error; } } else { @@ -363,64 +366,80 @@ static int enable_events(char *session_name) } } - ret = lttng_enable_event(handle, &ev, channel_name); - if (ret < 0) { - switch (-ret) { - case LTTCOMM_KERN_EVENT_EXIST: - WARN("Kernel events already enabled (channel %s, session %s)", - channel_name, session_name); + if (!opt_filter) { + ret = lttng_enable_event(handle, &ev, channel_name); + if (ret < 0) { + switch (-ret) { + case LTTNG_ERR_KERN_EVENT_EXIST: + WARN("Kernel events already enabled (channel %s, session %s)", + channel_name, session_name); + break; + default: + ERR("Events: %s (channel %s, session %s)", + lttng_strerror(ret), channel_name, session_name); + break; + } + goto end; + } + + switch (opt_event_type) { + case LTTNG_EVENT_TRACEPOINT: + 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; - default: - ERR("Events: %s (channel %s, session %s)", - lttng_strerror(ret), channel_name, session_name); + case LTTNG_EVENT_SYSCALL: + if (opt_kernel) { + MSG("All kernel system calls are enabled in channel %s", + channel_name); + } break; + case LTTNG_EVENT_ALL: + 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: + /* + * We should not be here since lttng_enable_event should have + * failed on the event type. + */ + goto error; } - goto end; } if (opt_filter) { - ret = lttng_set_event_filter(handle, ev.name, channel_name, + ret = lttng_enable_event_with_filter(handle, &ev, channel_name, opt_filter); if (ret < 0) { - ERR("Error setting filter"); - ret = -1; + fprintf(stderr, "Ret filter: %d\n", ret); + switch (-ret) { + case LTTNG_ERR_FILTER_EXIST: + WARN("Filter on events is already enabled" + " (channel %s, session %s)", + channel_name, session_name); + break; + case LTTNG_ERR_FILTER_INVAL: + case LTTNG_ERR_FILTER_NOMEM: + ERR("%s", lttng_strerror(ret)); + default: + ERR("Setting filter: '%s'", opt_filter); + break; + } goto error; - } - } - - switch (opt_event_type) { - case LTTNG_EVENT_TRACEPOINT: - 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) { - MSG("All kernel system calls are enabled in channel %s", - channel_name); - } - break; - case LTTNG_EVENT_ALL: - 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); + MSG("Filter '%s' successfully set", opt_filter); } - break; - default: - /* - * We should not be here since lttng_enable_event should have - * failed on the event type. - */ - goto error; } goto end; } @@ -517,7 +536,7 @@ static int enable_events(char *session_name) ev.loglevel = loglevel_str_to_value(opt_loglevel); if (ev.loglevel == -1) { ERR("Unknown loglevel %s", opt_loglevel); - ret = -1; + ret = -LTTNG_ERR_INVALID; goto error; } } else { @@ -529,31 +548,48 @@ static int enable_events(char *session_name) goto error; } - ret = lttng_enable_event(handle, &ev, channel_name); - if (ret < 0) { - /* Turn ret to positive value to handle the positive error code */ - switch (-ret) { - case LTTCOMM_KERN_EVENT_EXIST: - WARN("Kernel event %s already enabled (channel %s, session %s)", - event_name, channel_name, session_name); - break; - default: - ERR("Event %s: %s (channel %s, session %s)", event_name, - lttng_strerror(ret), channel_name, session_name); - break; + if (!opt_filter) { + ret = lttng_enable_event(handle, &ev, channel_name); + if (ret < 0) { + /* Turn ret to positive value to handle the positive error code */ + switch (-ret) { + case LTTNG_ERR_KERN_EVENT_EXIST: + WARN("Kernel event %s already enabled (channel %s, session %s)", + event_name, channel_name, session_name); + break; + default: + ERR("Event %s: %s (channel %s, session %s)", event_name, + lttng_strerror(ret), channel_name, session_name); + break; + } + warn = 1; + } else { + MSG("%s event %s created in channel %s", + opt_kernel ? "kernel": "UST", event_name, channel_name); } - warn = 1; - } else { - MSG("%s event %s created in channel %s", - opt_kernel ? "kernel": "UST", event_name, channel_name); } + if (opt_filter) { - ret = lttng_set_event_filter(handle, ev.name, - channel_name, opt_filter); + ret = lttng_enable_event_with_filter(handle, &ev, channel_name, + opt_filter); if (ret < 0) { - ERR("Error setting filter"); - ret = -1; + switch (-ret) { + case LTTNG_ERR_FILTER_EXIST: + WARN("Filter on event %s is already enabled" + " (channel %s, session %s)", + event_name, channel_name, session_name); + break; + case LTTNG_ERR_FILTER_INVAL: + case LTTNG_ERR_FILTER_NOMEM: + ERR("%s", lttng_strerror(ret)); + default: + ERR("Setting filter for event %s: '%s'", ev.name, + opt_filter); + break; + } goto error; + } else { + MSG("Filter '%s' successfully set", opt_filter); } }