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;
-static pid_t opt_pid;
-#endif
enum {
OPT_HELP = 1,
OPT_TRACEPOINT,
OPT_PROBE,
OPT_FUNCTION,
- OPT_FUNCTION_ENTRY,
OPT_SYSCALL,
OPT_USERSPACE,
OPT_LOGLEVEL,
{"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},
-#if 0
- /*
- * Currently removed from lttng kernel tracer. Removed from
- * lttng UI to discourage its use.
- */
- {"function:entry", 0, POPT_ARG_STRING, &opt_function_entry_symbol, OPT_FUNCTION_ENTRY, 0, 0},
-#endif
{"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
{"loglevel", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL, 0, 0},
{"loglevel-only", 0, POPT_ARG_STRING, 0, OPT_LOGLEVEL_ONLY, 0, 0},
*/
static void usage(FILE *ofp)
{
- fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] [-k|-u] [OPTIONS] \n");
+ fprintf(ofp, "usage: lttng enable-event NAME[,NAME2,...] (-k | -u | -j | -l | -p) [OPTIONS] \n");
fprintf(ofp, "\n");
fprintf(ofp, "Options:\n");
fprintf(ofp, " -h, --help Show this help\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, " -l, --log4j Apply for Java application using LOG4j\n");
- fprintf(ofp, " -p, --python Apply for Java application using LOG4j\n");
+ fprintf(ofp, " -p, --python Apply for Python application\n");
fprintf(ofp, "\n");
fprintf(ofp, "Event options:\n");
fprintf(ofp, " --tracepoint Tracepoint event (default)\n");
fprintf(ofp, " Dynamic function entry/return probe.\n");
fprintf(ofp, " Addr and offset can be octal (0NNN...),\n");
fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n");
-#if 0
- fprintf(ofp, " --function:entry symbol\n");
- fprintf(ofp, " Function tracer event\n");
-#endif
fprintf(ofp, " --syscall System call event\n");
fprintf(ofp, "\n");
fprintf(ofp, " --loglevel name\n");
fprintf(ofp, " Tracepoint loglevel range from 0 to loglevel.\n");
- fprintf(ofp, " For JUL/LOG4j domain, see the table below for the range values.\n");
+ fprintf(ofp, " For JUL/LOG4j/Python domains, see the table below for the range values.\n");
fprintf(ofp, " --loglevel-only name\n");
fprintf(ofp, " Tracepoint loglevel (only this loglevel)\n");
fprintf(ofp, "\n");
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
+ if (!inputstr || strlen(inputstr) == 0) {
+ return -1;
+ }
+
/*
* Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
* added at the end of the loop so a the upper bound we avoid the overflow.
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
+ if (!inputstr || strlen(inputstr) == 0) {
+ return -1;
+ }
+
/*
* Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
* added at the end of the loop so a the upper bound we avoid the overflow.
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
+ if (!inputstr || strlen(inputstr) == 0) {
+ return -1;
+ }
+
/*
* Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
* added at the end of the loop so a the upper bound we avoid the overflow.
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
+ if (!inputstr || strlen(inputstr) == 0) {
+ return -1;
+ }
+
/*
* Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
* added at the end of the loop so a the upper bound we avoid the overflow.
goto error;
}
new_exclusion_list = realloc(exclusion_list,
- sizeof(char **) * (exclusion_count + 1));
+ sizeof(char *) * (exclusion_count + 1));
if (!new_exclusion_list) {
PERROR("realloc");
free(string);
memset(&dom, 0, sizeof(dom));
if (opt_kernel) {
- if (opt_filter) {
- ERR("Filter not implement for kernel tracing yet");
- ret = CMD_ERROR;
- goto error;
- }
if (opt_loglevel) {
WARN("Kernel loglevels are not supported.");
}
/* Default setup for enable all */
if (opt_kernel) {
ev.type = opt_event_type;
- ev.name[0] = '\0';
+ strcpy(ev.name, "*");
/* kernel loglevels not implemented */
ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
} else {
print_channel_name(channel_name));
switch (opt_event_type) {
- case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
- ev.type = LTTNG_EVENT_TRACEPOINT;
- /* Fall-through */
+ case LTTNG_EVENT_ALL: /* Enable tracepoints and syscalls */
+ /* If event name differs from *, select tracepoint. */
+ if (strcmp(ev.name, "*")) {
+ ev.type = LTTNG_EVENT_TRACEPOINT;
+ }
+ break;
case LTTNG_EVENT_TRACEPOINT:
break;
case LTTNG_EVENT_PROBE:
goto error;
}
break;
- case LTTNG_EVENT_FUNCTION_ENTRY:
- strncpy(ev.attr.ftrace.symbol_name, opt_function_entry_symbol,
- LTTNG_SYMBOL_NAME_LEN);
- ev.attr.ftrace.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
- break;
case LTTNG_EVENT_SYSCALL:
ev.type = LTTNG_EVENT_SYSCALL;
break;
/* kernel loglevels not implemented */
ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
} else if (opt_userspace) { /* User-space tracer action */
-#if 0
- if (opt_cmd_name != NULL || opt_pid) {
- MSG("Only supporting tracing all UST processes (-u) for now.");
- ret = CMD_UNDEFINED;
- goto error;
- }
-#endif
-
DBG("Enabling UST event %s for channel %s, loglevel %s", event_name,
print_channel_name(channel_name), opt_loglevel ? : "<all>");
break;
case LTTNG_EVENT_PROBE:
case LTTNG_EVENT_FUNCTION:
- case LTTNG_EVENT_FUNCTION_ENTRY:
case LTTNG_EVENT_SYSCALL:
default:
ERR("Event type not available for user-space tracing");
case OPT_FUNCTION:
opt_event_type = LTTNG_EVENT_FUNCTION;
break;
- case OPT_FUNCTION_ENTRY:
- opt_event_type = LTTNG_EVENT_FUNCTION_ENTRY;
- break;
case OPT_SYSCALL:
opt_event_type = LTTNG_EVENT_SYSCALL;
break;