X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=526fbbf35c157f2bf545ef53b68dc0e45ef17365;hp=0af994fc421c5b00c4ca11615cee2c9220aa5466;hb=c585821bc78955b3d747fcd733aa1d2b81a3258e;hpb=d07ceecd2f35ccf383c7529a18dcc9b9c4b8cb17

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 0af994fc4..526fbbf35 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -563,6 +563,7 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 	stream->endpoint_status = CONSUMER_ENDPOINT_ACTIVE;
 	stream->index_fd = -1;
 	pthread_mutex_init(&stream->lock, NULL);
+	pthread_mutex_init(&stream->metadata_timer_lock, NULL);
 
 	/* If channel is the metadata, flag this stream as metadata. */
 	if (type == CONSUMER_CHANNEL_TYPE_METADATA) {
@@ -936,7 +937,9 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		uint64_t tracefile_count,
 		uint64_t session_id_per_pid,
 		unsigned int monitor,
-		unsigned int live_timer_interval)
+		unsigned int live_timer_interval,
+		const char *root_shm_path,
+		const char *shm_path)
 {
 	struct lttng_consumer_channel *channel;
 
@@ -993,6 +996,15 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 	strncpy(channel->name, name, sizeof(channel->name));
 	channel->name[sizeof(channel->name) - 1] = '\0';
 
+	if (root_shm_path) {
+		strncpy(channel->root_shm_path, root_shm_path, sizeof(channel->root_shm_path));
+		channel->root_shm_path[sizeof(channel->root_shm_path) - 1] = '\0';
+	}
+	if (shm_path) {
+		strncpy(channel->shm_path, shm_path, sizeof(channel->shm_path));
+		channel->shm_path[sizeof(channel->shm_path) - 1] = '\0';
+	}
+
 	lttng_ht_node_init_u64(&channel->node, channel->key);
 
 	channel->wait_fd = -1;