X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=dc2c91ddc5bde29d07a14b8759a74671c924b51b;hp=f19dbec37f51697209c0ae1d678a1af7768e8533;hb=88e3c2f5610b9ac89b0923d448fee34140fc46fb;hpb=58d3fed5a62a82ce8487dce41a3092e79a9bca15

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index f19dbec37..dc2c91ddc 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -311,6 +311,18 @@ int channel_ust_enable(struct ltt_ust_session *usess,
 		DBG3("Channel %s already enabled. Skipping", uchan->name);
 		ret = LTTNG_ERR_UST_CHAN_EXIST;
 		goto end;
+	} else {
+		uchan->enabled = 1;
+		DBG2("Channel %s enabled successfully", uchan->name);
+	}
+
+	if (!usess->active) {
+		/*
+		 * The channel will be activated against the apps
+		 * when the session is started as part of the
+		 * application channel "synchronize" operation.
+		 */
+		goto end;
 	}
 
 	DBG2("Channel %s being enabled in UST domain", uchan->name);
@@ -325,8 +337,6 @@ int channel_ust_enable(struct ltt_ust_session *usess,
 	 */
 	(void) ust_app_enable_channel_glb(usess, uchan);
 
-	uchan->enabled = 1;
-	DBG2("Channel %s enabled successfully", uchan->name);
 
 end:
 	return ret;
@@ -465,11 +475,13 @@ int channel_ust_create(struct ltt_ust_session *usess,
 		goto error_free_chan;
 	}
 
-	/* Enable channel for global domain */
-	ret = ust_app_create_channel_glb(usess, uchan);
-	if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
-		ret = LTTNG_ERR_UST_CHAN_FAIL;
-		goto error_free_chan;
+	if (usess->active) {
+		/* Enable channel for global domain */
+		ret = ust_app_create_channel_glb(usess, uchan);
+		if (ret < 0 && ret != -LTTNG_UST_ERR_EXIST) {
+			ret = LTTNG_ERR_UST_CHAN_FAIL;
+			goto error_free_chan;
+		}
 	}
 
 	/* Adding the channel to the channel hash table. */
@@ -533,6 +545,9 @@ int channel_ust_disable(struct ltt_ust_session *usess,
 		DBG2("Channel UST %s already disabled", uchan->name);
 		goto end;
 	}
+	if (!usess->active) {
+		goto end;
+	}
 
 	DBG2("Channel %s being disabled in UST global domain", uchan->name);
 	/* Disable channel for global domain */