Implement enable all vs enable tracepoints vs enable syscalls

[lttng-tools.git] / lttng / commands / enable_events.c

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index 0d47b6291cec082cd469011157294dcda8ab107d..fbcd40dafac36d388e79fa2bc6f34d3194bac468 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -53,7 +53,7 @@ enum {
        OPT_PROBE,
        OPT_FUNCTION,
        OPT_FUNCTION_ENTRY,
-       OPT_SYSCALLS,
+       OPT_SYSCALL,
 };
 
 static struct lttng_handle *handle;
@@ -73,7 +73,7 @@ static struct poptOption long_options[] = {
        {"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}
 };
 
@@ -105,7 +105,7 @@ static void usage(FILE *ofp)
        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");
 }
@@ -213,33 +213,44 @@ static int enable_events(char *session_name)
        }
 
        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 */
@@ -255,6 +266,9 @@ static int enable_events(char *session_name)
                        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:
@@ -279,7 +293,7 @@ static int enable_events(char *session_name)
                                        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;
@@ -310,6 +324,7 @@ static int enable_events(char *session_name)
                event_name = strtok(NULL, ",");
        }
 
+end:
 error:
        if (opt_channel_name == NULL) {
                free(channel_name);
@@ -334,7 +349,7 @@ int cmd_enable_events(int argc, const char **argv)
        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) {
@@ -364,8 +379,8 @@ int cmd_enable_events(int argc, const char **argv)
                        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);