Fix: disable all ust events

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 7b36ae252a4660a29291472fcfbf80d57aabc3dc..660cd0ca8f1bea97aacebead6da8b1acd14f352e 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1284,7 +1284,14 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
                switch (event->type) {
                case LTTNG_EVENT_ALL:
-                       ret = event_ust_disable_tracepoint(usess, uchan, event_name);
+                       if (strlen(event->name) == 1 &&
+                                       !strncmp(event->name, "*", 1)) {
+                               ret = event_ust_disable_all_tracepoints(usess,
+                                               uchan);
+                       } else {
+                               ret = event_ust_disable_tracepoint(usess, uchan,
+                                               event_name);
+                       }
                        if (ret != LTTNG_OK) {
                                goto error_unlock;
                        }
@@ -1619,9 +1626,10 @@ static int _cmd_enable_event(struct ltt_session *session,
                        event->type = LTTNG_EVENT_SYSCALL;      /* Hack */
                        ret = event_kernel_enable_event(kchan, event,
                                filter_expression_a, filter_a);
+                       /* We have passed ownership */
+                       filter_expression_a = NULL;
+                       filter_a = NULL;
                        if (ret != LTTNG_OK) {
-                               free(filter_expression_a);
-                               free(filter_a);
                                goto error;
                        }
                        break;