X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=6ea3c919f1dc8806cb2de0e4515d81a0e06d34f2;hp=18a958d321e6101d1de0c2c6ff00f75fae9e06bd;hb=c2063d0b0b102191bc656fabdab8a23ed570e9ba;hpb=6a240cd997676bd36ad7c8f7446191664409633a diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 18a958d32..6ea3c919f 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -36,12 +36,14 @@ static int opt_loglevel_type; static int opt_kernel; static char *opt_session_name; static int opt_userspace; +static int opt_jul; static int opt_enable_all; static char *opt_probe; static char *opt_function; static char *opt_function_entry_symbol; static char *opt_channel_name; static char *opt_filter; +static char *opt_exclude; #if 0 /* Not implemented yet */ static char *opt_cmd_name; @@ -60,6 +62,7 @@ enum { OPT_LOGLEVEL_ONLY, OPT_LIST_OPTIONS, OPT_FILTER, + OPT_EXCLUDE, }; static struct lttng_handle *handle; @@ -72,6 +75,7 @@ static struct poptOption long_options[] = { {"channel", 'c', POPT_ARG_STRING, &opt_channel_name, 0, 0, 0}, {"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0}, {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0}, + {"jul", 'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0}, {"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}, @@ -87,6 +91,7 @@ static struct poptOption long_options[] = { {"loglevel-only", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL_ONLY, 0, 0}, {"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL}, {"filter", 'f', POPT_ARG_STRING, &opt_filter, OPT_FILTER, 0, 0}, + {"exclude", 'x', POPT_ARG_STRING, &opt_exclude, OPT_EXCLUDE, 0, 0}, {0, 0, 0, 0, 0, 0, 0} }; @@ -105,6 +110,7 @@ static void usage(FILE *ofp) fprintf(ofp, " -a, --all Enable all tracepoints and syscalls\n"); fprintf(ofp, " -k, --kernel Apply for the kernel tracer\n"); fprintf(ofp, " -u, --userspace Apply to the user-space tracer\n"); + fprintf(ofp, " -j, --jul Apply for Java application using JUL\n"); fprintf(ofp, "\n"); fprintf(ofp, "Event options:\n"); fprintf(ofp, " --tracepoint Tracepoint event (default)\n"); @@ -153,7 +159,7 @@ static void usage(FILE *ofp) fprintf(ofp, " TRACE_DEBUG_LINE = 13\n"); fprintf(ofp, " TRACE_DEBUG = 14\n"); fprintf(ofp, " (shortcuts such as \"system\" are allowed)\n"); - fprintf(ofp, " --filter \'expression\'\n"); + fprintf(ofp, " -f, --filter \'expression\'\n"); fprintf(ofp, " Filter expression on event fields and context.\n"); fprintf(ofp, " Event recording depends on evaluation.\n"); fprintf(ofp, " Only specify on first activation of\n"); @@ -189,6 +195,12 @@ static void usage(FILE *ofp) fprintf(ofp, " '$ctx.procname == \"demo*\"'\n"); fprintf(ofp, " '$ctx.vpid >= 4433 && $ctx.vpid < 4455'\n"); fprintf(ofp, " '$ctx.vtid == 1234'\n"); + fprintf(ofp, " -x, --exclude LIST\n"); + fprintf(ofp, " Add exclusions to UST tracepoints:\n"); + fprintf(ofp, " Events that match any of the items\n"); + fprintf(ofp, " in the comma-separated LIST are not\n"); + fprintf(ofp, " enabled, even if they match a wildcard\n"); + fprintf(ofp, " definition of the event.\n"); fprintf(ofp, "\n"); } @@ -312,12 +324,24 @@ int loglevel_str_to_value(const char *inputstr) } } +static +const char *print_channel_name(const char *name) +{ + return name ? : DEFAULT_CHANNEL_NAME; +} + +static +const char *print_raw_channel_name(const char *name) +{ + return name ? : ""; +} + /* * Enabling event using the lttng API. */ static int enable_events(char *session_name) { - int err, ret = CMD_SUCCESS, warn = 0; + int ret = CMD_SUCCESS, warn = 0; char *event_name, *channel_name = NULL; struct lttng_event ev; struct lttng_domain dom; @@ -331,6 +355,9 @@ static int enable_events(char *session_name) ret = CMD_ERROR; goto error; } + if (opt_loglevel) { + WARN("Kernel loglevels are not supported."); + } } /* Create lttng domain */ @@ -341,21 +368,17 @@ static int enable_events(char *session_name) dom.type = LTTNG_DOMAIN_UST; /* Default. */ dom.buf_type = LTTNG_BUFFER_PER_UID; + } else if (opt_jul) { + dom.type = LTTNG_DOMAIN_JUL; + /* Default. */ + dom.buf_type = LTTNG_BUFFER_PER_UID; } else { - ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); + print_missing_domain(); 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; - } + channel_name = opt_channel_name; handle = lttng_create_handle(session_name, &dom); if (handle == NULL) { @@ -392,11 +415,15 @@ static int enable_events(char *session_name) switch (-ret) { case LTTNG_ERR_KERN_EVENT_EXIST: WARN("Kernel events already enabled (channel %s, session %s)", - channel_name, session_name); + print_channel_name(channel_name), session_name); break; default: ERR("Events: %s (channel %s, session %s)", - lttng_strerror(ret), channel_name, session_name); + lttng_strerror(ret), + ret == -LTTNG_ERR_NEED_CHANNEL_NAME + ? print_raw_channel_name(channel_name) + : print_channel_name(channel_name), + session_name); break; } goto end; @@ -404,30 +431,33 @@ static int enable_events(char *session_name) switch (opt_event_type) { case LTTNG_EVENT_TRACEPOINT: - if (opt_loglevel) { + if (opt_loglevel && dom.type != LTTNG_DOMAIN_KERNEL) { MSG("All %s tracepoints are enabled in channel %s for loglevel %s", - opt_kernel ? "kernel" : "UST", channel_name, + get_domain_str(dom.type), + print_channel_name(channel_name), opt_loglevel); } else { MSG("All %s tracepoints are enabled in channel %s", - opt_kernel ? "kernel" : "UST", channel_name); - + get_domain_str(dom.type), + print_channel_name(channel_name)); } break; case LTTNG_EVENT_SYSCALL: if (opt_kernel) { MSG("All kernel system calls are enabled in channel %s", - channel_name); + print_channel_name(channel_name)); } break; case LTTNG_EVENT_ALL: - if (opt_loglevel) { + if (opt_loglevel && dom.type != LTTNG_DOMAIN_KERNEL) { MSG("All %s events are enabled in channel %s for loglevel %s", - opt_kernel ? "kernel" : "UST", channel_name, + get_domain_str(dom.type), + print_channel_name(channel_name), opt_loglevel); } else { MSG("All %s events are enabled in channel %s", - opt_kernel ? "kernel" : "UST", channel_name); + get_domain_str(dom.type), + print_channel_name(channel_name)); } break; default: @@ -444,14 +474,17 @@ static int enable_events(char *session_name) if (ret < 0) { switch (-ret) { case LTTNG_ERR_FILTER_EXIST: - WARN("Filter on events is already enabled" + WARN("Filter on all events is already enabled" " (channel %s, session %s)", - channel_name, session_name); + print_channel_name(channel_name), session_name); break; - case LTTNG_ERR_FILTER_INVAL: - case LTTNG_ERR_FILTER_NOMEM: default: - ERR("%s", lttng_strerror(ret)); + ERR("All events: %s (channel %s, session %s, filter \'%s\')", + lttng_strerror(ret), + ret == -LTTNG_ERR_NEED_CHANNEL_NAME + ? print_raw_channel_name(channel_name) + : print_channel_name(channel_name), + session_name, opt_filter); break; } goto error; @@ -473,7 +506,8 @@ static int enable_events(char *session_name) /* Kernel tracer action */ if (opt_kernel) { DBG("Enabling kernel event %s for channel %s", - event_name, channel_name); + event_name, + print_channel_name(channel_name)); switch (opt_event_type) { case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ @@ -510,12 +544,6 @@ static int enable_events(char *session_name) goto error; } - if (opt_loglevel) { - MSG("Kernel loglevels are not supported."); - ret = CMD_UNSUPPORTED; - goto error; - } - /* kernel loglevels not implemented */ ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; } else if (opt_userspace) { /* User-space tracer action */ @@ -528,7 +556,7 @@ static int enable_events(char *session_name) #endif DBG("Enabling UST event %s for channel %s, loglevel %s", event_name, - channel_name, opt_loglevel ? : ""); + print_channel_name(channel_name), opt_loglevel ? : ""); switch (opt_event_type) { case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */ @@ -560,8 +588,18 @@ static int enable_events(char *session_name) } else { ev.loglevel = -1; } + } else if (opt_jul) { + if (opt_event_type != LTTNG_EVENT_ALL && + opt_event_type != LTTNG_EVENT_TRACEPOINT) { + ERR("Event type not supported for JUL domain."); + ret = CMD_UNSUPPORTED; + goto error; + } + ev.type = LTTNG_EVENT_TRACEPOINT; + strncpy(ev.name, event_name, LTTNG_SYMBOL_NAME_LEN); + ev.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0'; } else { - ERR("Please specify a tracer (-k/--kernel or -u/--userspace)"); + print_missing_domain(); ret = CMD_ERROR; goto error; } @@ -573,17 +611,23 @@ static int enable_events(char *session_name) switch (-ret) { case LTTNG_ERR_KERN_EVENT_EXIST: WARN("Kernel event %s already enabled (channel %s, session %s)", - event_name, channel_name, session_name); + event_name, + print_channel_name(channel_name), session_name); break; default: ERR("Event %s: %s (channel %s, session %s)", event_name, - lttng_strerror(ret), channel_name, session_name); + lttng_strerror(ret), + ret == -LTTNG_ERR_NEED_CHANNEL_NAME + ? print_raw_channel_name(channel_name) + : print_channel_name(channel_name), + session_name); break; } warn = 1; } else { MSG("%s event %s created in channel %s", - opt_kernel ? "kernel": "UST", event_name, channel_name); + get_domain_str(dom.type), event_name, + print_channel_name(channel_name)); } } @@ -595,14 +639,16 @@ static int enable_events(char *session_name) case LTTNG_ERR_FILTER_EXIST: WARN("Filter on event %s is already enabled" " (channel %s, session %s)", - event_name, channel_name, session_name); + event_name, + print_channel_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); + ERR("Event %s: %s (channel %s, session %s, filter \'%s\')", ev.name, + lttng_strerror(ret), + ret == -LTTNG_ERR_NEED_CHANNEL_NAME + ? print_raw_channel_name(channel_name) + : print_channel_name(channel_name), + session_name, opt_filter); break; } goto error; @@ -620,9 +666,6 @@ error: if (warn) { ret = CMD_WARNING; } - if (opt_channel_name == NULL) { - free(channel_name); - } lttng_destroy_handle(handle); return ret; @@ -680,6 +723,8 @@ int cmd_enable_events(int argc, const char **argv) goto end; case OPT_FILTER: break; + case OPT_EXCLUDE: + break; default: usage(stderr); ret = CMD_UNDEFINED;