Implement kernel filter support

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

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 1b3d5f7cd7d5d124d60dd95ac1e782f2363c778f..ab32994bdd95dc290a03986670c1450060f96445 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -713,11 +713,6 @@ static int enable_events(char *session_name)
        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.");
                }
@@ -777,7 +772,7 @@ static int enable_events(char *session_name)
                /* 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 {
@@ -1034,9 +1029,12 @@ static int enable_events(char *session_name)
                                        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: