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;
OPT_LOGLEVEL_ONLY,
OPT_LIST_OPTIONS,
OPT_FILTER,
+ OPT_EXCLUDE,
};
static struct lttng_handle *handle;
{"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},
{"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}
};
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");
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");
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");
}
ret = CMD_ERROR;
goto error;
}
+ if (opt_loglevel) {
+ WARN("Kernel loglevels are not supported.");
+ }
}
/* Create lttng domain */
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;
}
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:
}
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;
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 */
} 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;
}
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));
}
}
goto end;
case OPT_FILTER:
break;
+ case OPT_EXCLUDE:
+ break;
default:
usage(stderr);
ret = CMD_UNDEFINED;