OPT_PROBE,
OPT_FUNCTION,
OPT_FUNCTION_ENTRY,
- OPT_SYSCALLS,
+ OPT_SYSCALL,
};
static struct lttng_handle *handle;
{"probe", 0, POPT_ARG_STRING, 0, OPT_PROBE, 0, 0},
{"function", 0, POPT_ARG_STRING, 0, OPT_FUNCTION, 0, 0},
{"function:entry", 0, POPT_ARG_STRING, 0, OPT_FUNCTION_ENTRY, 0, 0},
- {"syscalls", 0, POPT_ARG_NONE, 0, OPT_SYSCALLS, 0, 0},
+ {"syscall", 0, POPT_ARG_NONE, 0, OPT_SYSCALL, 0, 0},
{0, 0, 0, 0, 0, 0, 0}
};
fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n");
fprintf(ofp, " --function:entry symbol\n");
fprintf(ofp, " Function tracer event\n");
- fprintf(ofp, " --syscalls System calls\n");
+ fprintf(ofp, " --syscall System call event\n");
fprintf(ofp, " --marker User-space marker (deprecated)\n");
fprintf(ofp, "\n");
}
}
if (opt_enable_all) {
+ /* Default setup for enable all */
+ ev.name[0] = '\0';
+ ev.type = opt_event_type;
+
+ ret = lttng_enable_event(handle, &ev, channel_name);
+ if (ret < 0) {
+ goto error;
+ }
+
switch (opt_event_type) {
case LTTNG_EVENT_TRACEPOINT:
if (opt_kernel) {
- ret = lttng_enable_event(handle, NULL, channel_name);
- if (ret == 0) {
- MSG("All kernel events are enabled in channel %s", channel_name);
- }
- goto error;
+ MSG("All kernel tracepoints are enabled in channel %s",
+ channel_name);
}
- /* TODO: User-space tracer */
break;
- case LTTNG_EVENT_SYSCALLS:
+ case LTTNG_EVENT_SYSCALL:
if (opt_kernel) {
- ev.name[0] = '\0';
- ev.type = opt_event_type;
-
- ret = lttng_enable_event(handle, &ev, channel_name);
- if (ret == 0) {
- MSG("All kernel system calls are enabled in channel %s", channel_name);
- }
- goto error;
+ MSG("All kernel system calls are enabled in channel %s",
+ channel_name);
+ }
+ break;
+ case LTTNG_EVENT_ALL:
+ if (opt_kernel) {
+ MSG("All kernel events are enabled in channel %s",
+ channel_name);
}
break;
default:
- MSG("Enable all not supported for this instrumentation type.");
+ /*
+ * We should not be here since lttng_enable_event should had failed
+ * on the event type.
+ */
goto error;
+
}
+
+ goto end;
}
/* Strip event list */
ev.type = opt_event_type;
switch (opt_event_type) {
+ case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
+ ev.type = LTTNG_EVENT_TRACEPOINT;
+ /* Fall-through */
case LTTNG_EVENT_TRACEPOINT:
break;
case LTTNG_EVENT_PROBE:
LTTNG_SYMBOL_NAME_LEN);
ev.attr.ftrace.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
break;
- case LTTNG_EVENT_SYSCALLS:
+ case LTTNG_EVENT_SYSCALL:
MSG("per-syscall selection not supported yet. Use \"-a\" for all syscalls.");
ret = CMD_NOT_IMPLEMENTED;
goto error;
event_name = strtok(NULL, ",");
}
+end:
error:
if (opt_channel_name == NULL) {
free(channel_name);
poptReadDefaultConfig(pc, 0);
/* Default event type */
- opt_event_type = LTTNG_EVENT_TRACEPOINT;
+ opt_event_type = LTTNG_EVENT_ALL;
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
opt_event_type = LTTNG_EVENT_FUNCTION_ENTRY;
opt_function_entry_symbol = poptGetOptArg(pc);
break;
- case OPT_SYSCALLS:
- opt_event_type = LTTNG_EVENT_SYSCALLS;
+ case OPT_SYSCALL:
+ opt_event_type = LTTNG_EVENT_SYSCALL;
break;
default:
usage(stderr);