X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=af6abbe6e6b4e93bc5950dfd000a9d0236e9cfb7;hp=36ee84f39d6772b1f24d18994d6a939379a06c48;hb=d5dd17fd22066461e22eae8f77062cb3b9b111bc;hpb=f2611ab0d4e92bdbec5adc45fe766a6fe29ea208 diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 36ee84f39..af6abbe6e 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"); @@ -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"); } @@ -324,6 +336,94 @@ const char *print_raw_channel_name(const char *name) return name ? : ""; } +/* + * Compare list of exclusions against an event name. + * Return a list of legal exclusion names. + * Produce an error or a warning about others (depending on the situation) + */ +static +int check_exclusion_subsets(const char *event_name, + const char *exclusions, + int *exclusion_count_ptr, + char ***exclusion_list_ptr) +{ + const char *excluder_ptr; + const char *event_ptr; + const char *next_excluder; + int excluder_length; + int exclusion_count = 0; + char **exclusion_list = NULL; + int ret = CMD_SUCCESS; + + if (event_name[strlen(event_name) - 1] != '*') { + ERR("Event %s: Excluders can only be used with wildcarded events", event_name); + goto error; + } + + next_excluder = exclusions; + while (*next_excluder != 0) { + event_ptr = event_name; + excluder_ptr = next_excluder; + excluder_length = strcspn(next_excluder, ","); + + /* Scan both the excluder and the event letter by letter */ + while (1) { + char e, x; + + e = *event_ptr; + x = *excluder_ptr; + + if (x == '*') { + /* Event is a subset of the excluder */ + ERR("Event %s: %.*s excludes all events from %s", + event_name, + excluder_length, + next_excluder, + event_name); + goto error; + } + if (e == '*') { + /* Excluder is a proper subset of event */ + exclusion_count++; + exclusion_list = realloc(exclusion_list, sizeof(char **) * exclusion_count); + exclusion_list[exclusion_count - 1] = strndup(next_excluder, excluder_length); + + break; + } + if (x != e) { + /* Excluder and event sets have no common elements */ + WARN("Event %s: %.*s does not exclude any events from %s", + event_name, + excluder_length, + next_excluder, + event_name); + break; + } + excluder_ptr++; + event_ptr++; + } + /* next excluder */ + next_excluder += excluder_length; + if (*next_excluder == ',') { + next_excluder++; + } + } + goto end; +error: + while (exclusion_count--) { + free(exclusion_list[exclusion_count]); + } + if (exclusion_list != NULL) { + free(exclusion_list); + } + exclusion_list = NULL; + exclusion_count = 0; + ret = CMD_ERROR; +end: + *exclusion_count_ptr = exclusion_count; + *exclusion_list_ptr = exclusion_list; + return ret; +} /* * Enabling event using the lttng API. */ @@ -333,6 +433,8 @@ static int enable_events(char *session_name) char *event_name, *channel_name = NULL; struct lttng_event ev; struct lttng_domain dom; + int exclusion_count = 0; + char **exclusion_list = NULL; memset(&ev, 0, sizeof(ev)); memset(&dom, 0, sizeof(dom)); @@ -343,6 +445,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 */ @@ -353,8 +458,18 @@ 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_kernel && opt_exclude) { + ERR("Event name exclusions are not yet implemented for kernel events"); ret = CMD_ERROR; goto error; } @@ -390,8 +505,18 @@ static int enable_events(char *session_name) } } + if (opt_exclude) { + ret = check_exclusion_subsets("*", opt_exclude, + &exclusion_count, &exclusion_list); + if (ret == CMD_ERROR) { + goto error; + } + } if (!opt_filter) { - ret = lttng_enable_event(handle, &ev, channel_name); + ret = lttng_enable_event_with_exclusions(handle, + &ev, channel_name, + NULL, + exclusion_count, exclusion_list); if (ret < 0) { switch (-ret) { case LTTNG_ERR_KERN_EVENT_EXIST: @@ -412,16 +537,15 @@ 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", + 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", + get_domain_str(dom.type), print_channel_name(channel_name)); - } break; case LTTNG_EVENT_SYSCALL: @@ -431,14 +555,14 @@ static int enable_events(char *session_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", + 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", + get_domain_str(dom.type), print_channel_name(channel_name)); } break; @@ -451,8 +575,8 @@ static int enable_events(char *session_name) } } if (opt_filter) { - ret = lttng_enable_event_with_filter(handle, &ev, channel_name, - opt_filter); + ret = lttng_enable_event_with_exclusions(handle, &ev, channel_name, + opt_filter, exclusion_count, exclusion_list); if (ret < 0) { switch (-ret) { case LTTNG_ERR_FILTER_EXIST: @@ -526,12 +650,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 */ @@ -565,6 +683,28 @@ static int enable_events(char *session_name) goto error; } + if (opt_exclude) { + if (opt_event_type != LTTNG_EVENT_ALL && opt_event_type != LTTNG_EVENT_TRACEPOINT) { + ERR("Exclusion option can only be used with tracepoint events"); + ret = CMD_ERROR; + goto error; + } + /* Free previously allocated items */ + if (exclusion_list != NULL) { + while (exclusion_count--) { + free(exclusion_list[exclusion_count]); + } + free(exclusion_list); + exclusion_list = NULL; + } + /* Check for proper subsets */ + ret = check_exclusion_subsets(event_name, opt_exclude, + &exclusion_count, &exclusion_list); + if (ret == CMD_ERROR) { + goto error; + } + } + ev.loglevel_type = opt_loglevel_type; if (opt_loglevel) { ev.loglevel = loglevel_str_to_value(opt_loglevel); @@ -576,14 +716,26 @@ 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; } if (!opt_filter) { - ret = lttng_enable_event(handle, &ev, channel_name); + ret = lttng_enable_event_with_exclusions(handle, + &ev, channel_name, + NULL, exclusion_count, exclusion_list); if (ret < 0) { /* Turn ret to positive value to handle the positive error code */ switch (-ret) { @@ -604,14 +756,14 @@ static int enable_events(char *session_name) warn = 1; } else { MSG("%s event %s created in channel %s", - opt_kernel ? "kernel": "UST", event_name, + get_domain_str(dom.type), event_name, print_channel_name(channel_name)); } } if (opt_filter) { - ret = lttng_enable_event_with_filter(handle, &ev, channel_name, - opt_filter); + ret = lttng_enable_event_with_exclusions(handle, &ev, channel_name, + opt_filter, exclusion_count, exclusion_list); if (ret < 0) { switch (-ret) { case LTTNG_ERR_FILTER_EXIST: @@ -646,6 +798,13 @@ error: } lttng_destroy_handle(handle); + if (exclusion_list != NULL) { + while (exclusion_count--) { + free(exclusion_list[exclusion_count]); + } + free(exclusion_list); + } + return ret; } @@ -701,6 +860,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;