Update version to 2.0-pre17

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

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index e435e1f7858f0d15133a31d5ad8004fbd359925b..3c1c3916e0344a48098fe92e4c771201c356f7a0 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -100,6 +100,11 @@ static void usage(FILE *ofp)
        fprintf(ofp, "\n");
        fprintf(ofp, "Event options:\n");
        fprintf(ofp, "    --tracepoint           Tracepoint event (default)\n");
+       fprintf(ofp, "                           - userspace tracer supports wildcards at end of string.\n");
+       fprintf(ofp, "                             Don't forget to quote to deal with bash expansion.\n");
+       fprintf(ofp, "                             e.g.:\n");
+       fprintf(ofp, "                               \"*\"\n");
+       fprintf(ofp, "                               \"app_component:na*\"\n");
        fprintf(ofp, "    --loglevel             Tracepoint loglevel\n");
        fprintf(ofp, "    --probe [addr | symbol | symbol+offset]\n");
        fprintf(ofp, "                           Dynamic probe.\n");
@@ -236,8 +241,14 @@ 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;
+
+               if (opt_kernel) {
+                       ev.type = opt_event_type;
+                       ev.name[0] = '\0';
+               } else {
+                       ev.type = LTTNG_EVENT_TRACEPOINT;
+                       strcpy(ev.name, "*");
+               }
 
                ret = lttng_enable_event(handle, &ev, channel_name);
                if (ret < 0) {