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 2d49aae2da892e1c41a47472145590c9d622fc00..606b9d9f64ee0324a301a270f35ebcd74fe4aa24 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1137,7 +1137,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;
                        }
@@ -1575,7 +1582,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                if (!agt) {
                        agt = agent_create(domain->type);
                        if (!agt) {
-                               ret = -LTTNG_ERR_NOMEM;
+                               ret = LTTNG_ERR_NOMEM;
                                goto error;
                        }
                        agent_add(agt, usess->agents);
@@ -1587,7 +1594,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
                default_event_name = event_get_default_agent_ust_name(domain->type);
                if (!default_event_name) {
-                       ret = -LTTNG_ERR_FATAL;
+                       ret = LTTNG_ERR_FATAL;
                        goto error;
                }
                strncpy(uevent.name, default_event_name, sizeof(uevent.name));
@@ -1616,6 +1623,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
                                        sizeof(struct lttng_filter_bytecode)
                                        + filter->len);
                                if (!filter_copy) {
+                                       ret = LTTNG_ERR_NOMEM;
                                        goto error;
                                }
 
@@ -2182,7 +2190,7 @@ int cmd_create_session_snapshot(char *name, struct lttng_uri *uris,
         * Create session in no output mode with URIs set to NULL. The uris we've
         * received are for a default snapshot output if one.
         */
-       ret = cmd_create_session_uri(name, NULL, 0, creds, -1);
+       ret = cmd_create_session_uri(name, NULL, 0, creds, 0);
        if (ret != LTTNG_OK) {
                goto error;
        }
@@ -3153,7 +3161,7 @@ int cmd_snapshot_record(struct ltt_session *session,
        int ret = LTTNG_OK;
        unsigned int use_tmp_output = 0;
        struct snapshot_output tmp_output;
-       unsigned int nb_streams, snapshot_success = 0;
+       unsigned int snapshot_success = 0;
 
        assert(session);
        assert(output);