X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=b1d98639343917f9aad46249dbac6fd9ea039f94;hb=1dfd9906a04873e9d381bf559eb8551c203c8a2a;hp=dfc8b31d0848ef2366ec5b66ef88b03b32ef31c9;hpb=60d21fa25f38b47b5867377035b68830105afcf9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index dfc8b31d0..b1d986393 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1290,7 +1290,14 @@ int cmd_disable_event(struct ltt_session *session,
 
 		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;
 			}
@@ -2757,7 +2764,11 @@ ssize_t cmd_list_events(enum lttng_domain_type domain,
 			rcu_read_lock();
 			cds_lfht_for_each_entry(session->ust_session->agents->ht,
 					&iter.iter, agt, node.node) {
-				nb_event = list_lttng_agent_events(agt, events);
+				if (agt->domain == domain) {
+					nb_event = list_lttng_agent_events(
+							agt, events);
+					break;
+				}
 			}
 			rcu_read_unlock();
 		}