X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=481bbeba04b2f91eef880335cbd3ac8ef5cb9302;hb=8c40c9d05cca5c9fd6b98055cb26462bc0efdab2;hp=7dfcf9a3cf46381675222dfbcb94a474e0e8eaa9;hpb=288bdb302a18194fe80e24af297e819575467059;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 7dfcf9a3c..481bbeba0 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -47,7 +47,7 @@
 
 #include "ust-consumer.h"
 
-#define UINT_MAX_STR_LEN 11	/* includes \0 */
+#define INT_MAX_STR_LEN 12	/* includes \0 */
 
 extern struct lttng_consumer_global_data consumer_data;
 extern int consumer_poll_timeout;
@@ -82,6 +82,7 @@ static void destroy_channel(struct lttng_consumer_channel *channel)
 	 */
 	if (channel->uchan) {
 		lttng_ustconsumer_del_channel(channel);
+		lttng_ustconsumer_free_channel(channel);
 	}
 	free(channel);
 }
@@ -247,14 +248,14 @@ error:
 static
 int get_stream_shm_path(char *stream_shm_path, const char *shm_path, int cpu)
 {
-	char cpu_nr[UINT_MAX_STR_LEN];  /* unsigned int max len */
+	char cpu_nr[INT_MAX_STR_LEN];  /* int max len */
 	int ret;
 
 	strncpy(stream_shm_path, shm_path, PATH_MAX);
 	stream_shm_path[PATH_MAX - 1] = '\0';
-	ret = snprintf(cpu_nr, UINT_MAX_STR_LEN, "%u", cpu);
-	if (ret != 1) {
-		ret = -1;
+	ret = snprintf(cpu_nr, INT_MAX_STR_LEN, "%i", cpu);
+	if (ret < 0) {
+		PERROR("snprintf");
 		goto end;
 	}
 	strncat(stream_shm_path, cpu_nr,
@@ -1830,8 +1831,6 @@ void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
 	if (chan->switch_timer_enabled == 1) {
 		consumer_timer_switch_stop(chan);
 	}
-	consumer_metadata_cache_destroy(chan);
-	ustctl_destroy_channel(chan->uchan);
 	for (i = 0; i < chan->nr_stream_fds; i++) {
 		int ret;
 
@@ -1852,7 +1851,6 @@ void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
 			}
 		}
 	}
-	free(chan->stream_fds);
 	/* Try to rmdir all directories under shm_path root. */
 	if (chan->root_shm_path[0]) {
 		(void) run_as_recursive_rmdir(chan->root_shm_path,
@@ -1860,6 +1858,16 @@ void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)
 	}
 }
 
+void lttng_ustconsumer_free_channel(struct lttng_consumer_channel *chan)
+{
+	assert(chan);
+	assert(chan->uchan);
+
+	consumer_metadata_cache_destroy(chan);
+	ustctl_destroy_channel(chan->uchan);
+	free(chan->stream_fds);
+}
+
 void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream)
 {
 	assert(stream);