X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fchannel.c;h=e84da039a8e25d1f9a7ef6bfc24d0cdb0d7a0f1d;hb=8f0646a03fbf31c19b85ec367dc2c3db56e6dbf7;hp=049c784b379102b36e2b362cc5ab69e05b47f78b;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 049c784b3..e84da039a 100644
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -55,7 +55,7 @@ struct lttng_channel *channel_new_default_attr(int dom,
 
 	switch (dom) {
 	case LTTNG_DOMAIN_KERNEL:
-		assert(type == LTTNG_BUFFER_GLOBAL);
+		LTTNG_ASSERT(type == LTTNG_BUFFER_GLOBAL);
 		chan->attr.subbuf_size =
 			default_get_kernel_channel_subbuf_size();
 		chan->attr.num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
@@ -146,8 +146,8 @@ int channel_kernel_disable(struct ltt_kernel_session *ksession,
 	int ret;
 	struct ltt_kernel_channel *kchan;
 
-	assert(ksession);
-	assert(channel_name);
+	LTTNG_ASSERT(ksession);
+	LTTNG_ASSERT(channel_name);
 
 	kchan = trace_kernel_get_channel_by_name(channel_name, ksession);
 	if (kchan == NULL) {
@@ -178,8 +178,8 @@ int channel_kernel_enable(struct ltt_kernel_session *ksession,
 {
 	int ret;
 
-	assert(ksession);
-	assert(kchan);
+	LTTNG_ASSERT(ksession);
+	LTTNG_ASSERT(kchan);
 
 	if (kchan->enabled == 0) {
 		ret = kernel_enable_channel(kchan);
@@ -229,7 +229,7 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
 	int ret;
 	struct lttng_channel *defattr = NULL;
 
-	assert(ksession);
+	LTTNG_ASSERT(ksession);
 
 	/* Creating channel attributes if needed */
 	if (attr == NULL) {
@@ -289,8 +289,8 @@ int channel_ust_enable(struct ltt_ust_session *usess,
 {
 	int ret = LTTNG_OK;
 
-	assert(usess);
-	assert(uchan);
+	LTTNG_ASSERT(usess);
+	LTTNG_ASSERT(uchan);
 
 	/* If already enabled, everything is OK */
 	if (uchan->enabled) {
@@ -340,7 +340,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	enum lttng_domain_type domain = LTTNG_DOMAIN_UST;
 	bool chan_published = false;
 
-	assert(usess);
+	LTTNG_ASSERT(usess);
 
 	/* Creating channel attributes if needed */
 	if (attr == NULL) {
@@ -397,7 +397,7 @@ int channel_ust_create(struct ltt_ust_session *usess,
 	/*
 	 * Invalid subbuffer size if it's lower then the page size.
 	 */
-	if (attr->attr.subbuf_size < page_size) {
+	if (attr->attr.subbuf_size < the_page_size) {
 		ret = LTTNG_ERR_INVALID;
 		goto error;
 	}
@@ -514,14 +514,21 @@ int channel_ust_disable(struct ltt_ust_session *usess,
 {
 	int ret = LTTNG_OK;
 
-	assert(usess);
-	assert(uchan);
+	LTTNG_ASSERT(usess);
+	LTTNG_ASSERT(uchan);
 
 	/* Already disabled */
 	if (uchan->enabled == 0) {
 		DBG2("Channel UST %s already disabled", uchan->name);
 		goto end;
 	}
+
+	uchan->enabled = 0;
+
+	/*
+	 * If session is inactive we don't notify the tracer right away. We
+	 * wait for the next synchronization.
+	 */
 	if (!usess->active) {
 		goto end;
 	}
@@ -534,8 +541,6 @@ int channel_ust_disable(struct ltt_ust_session *usess,
 		goto error;
 	}
 
-	uchan->enabled = 0;
-
 	DBG2("Channel %s disabled successfully", uchan->name);
 
 	return LTTNG_OK;