X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=7e4000a0fd1183365a9ccc7746e47297f0cb9d66;hp=63d7f0e2d3e0ab48a68104183e5054454bde7db6;hb=35a9059d90ff33b4cfd57ad613969e333dba23a1;hpb=be4f0921fc6786d2e58d793622d4e1016b739e92

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 63d7f0e2d..7e4000a0f 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -2191,7 +2191,7 @@ static int cmd_disable_channel(struct ltt_session *session,
 			goto error;
 		}
 
-		ret = ust_app_disable_channel_all(usess, uchan);
+		ret = ust_app_disable_channel_glb(usess, uchan);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;
@@ -2305,7 +2305,7 @@ static int cmd_enable_channel(struct ltt_session *session,
 			DBG2("UST channel %s added to global domain HT", attr->name);
 
 			/* Add channel to all registered applications */
-			ret = ust_app_create_channel_all(usess, uchan);
+			ret = ust_app_create_channel_glb(usess, uchan);
 			if (ret != 0) {
 				ret = LTTCOMM_UST_CHAN_FAIL;
 				goto error;
@@ -2317,7 +2317,7 @@ static int cmd_enable_channel(struct ltt_session *session,
 				goto error;
 			}
 
-			ret = ust_app_enable_channel_all(usess, uchan);
+			ret = ust_app_enable_channel_glb(usess, uchan);
 			if (ret < 0) {
 				ret = LTTCOMM_UST_ENABLE_FAIL;
 				goto error;
@@ -2378,6 +2378,7 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 	{
 		struct ltt_ust_session *usess;
 		struct ltt_ust_channel *uchan;
+		struct ltt_ust_event *uevent;
 
 		usess = session->ust_session;
 
@@ -2388,12 +2389,20 @@ static int cmd_disable_event(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = ust_app_disable_event(usess, uchan, event_name);
+		uevent = trace_ust_find_event_by_name(uchan->events, event_name);
+		if (uevent == NULL) {
+			ret = LTTCOMM_UST_EVENT_NOT_FOUND;
+			goto error;
+		}
+
+		ret = ust_app_disable_event_glb(usess, uchan, uevent);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;
 		}
 
+		uevent->enabled = 0;
+
 		DBG2("Disable UST event %s in channel %s completed", event_name,
 				channel_name);
 
@@ -2457,7 +2466,7 @@ static int cmd_disable_event_all(struct ltt_session *session, int domain,
 			goto error;
 		}
 
-		ret = ust_app_disable_event_all(usess, uchan);
+		ret = ust_app_disable_all_event_glb(usess, uchan);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
 			goto error;