X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=8a3533ba10c360097a8fb2cb0099a4f3d986f324;hp=f120144aaaa994383fd96eea1af4d671cb78c960;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hpb=6c1c0768320135c6936c371b09731851b508c023

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index f120144aa..8a3533ba1 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -109,6 +109,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	char *pathname = NULL;
 	struct lttcomm_consumer_msg msg;
 	struct ust_registry_channel *chan_reg;
+	char shm_path[PATH_MAX] = "";
 
 	assert(ua_sess);
 	assert(ua_chan);
@@ -136,10 +137,25 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 
 	if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) {
 		chan_id = -1U;
+		/*
+		 * Metadata channels shm_path (buffers) are handled within
+		 * session daemon. Consumer daemon should not try to create
+		 * those buffer files.
+		 */
 	} else {
 		chan_reg = ust_registry_channel_find(registry, chan_reg_key);
 		assert(chan_reg);
 		chan_id = chan_reg->chan_id;
+		if (ua_sess->shm_path[0]) {
+			strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
+			shm_path[sizeof(shm_path) - 1] = '\0';
+			strncat(shm_path, "/",
+				sizeof(shm_path) - strlen(shm_path) - 1);
+			strncat(shm_path, ua_chan->name,
+					sizeof(shm_path) - strlen(shm_path) - 1);
+				strncat(shm_path, "_",
+					sizeof(shm_path) - strlen(shm_path) - 1);
+		}
 	}
 
 	switch (ua_chan->attr.output) {
@@ -171,7 +187,8 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_chan->tracefile_count,
 			ua_sess->id,
 			ua_sess->output_traces,
-			ua_sess->uid);
+			ua_sess->uid,
+			shm_path);
 
 	health_code_update();
 
@@ -448,12 +465,12 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	assert(socket);
 
 	rcu_read_lock();
-	pthread_mutex_lock(socket->lock);
-
 	health_code_update();
 
 	/* Wait for a metadata request */
+	pthread_mutex_lock(socket->lock);
 	ret = consumer_socket_recv(socket, &request, sizeof(request));
+	pthread_mutex_unlock(socket->lock);
 	if (ret < 0) {
 		goto end;
 	}
@@ -488,7 +505,9 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	}
 	assert(ust_reg);
 
+	pthread_mutex_lock(&ust_reg->lock);
 	ret_push = ust_app_push_metadata(ust_reg, socket, 1);
+	pthread_mutex_unlock(&ust_reg->lock);
 	if (ret_push < 0) {
 		ERR("Pushing metadata");
 		ret = -1;
@@ -498,7 +517,6 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	ret = 0;
 
 end:
-	pthread_mutex_unlock(socket->lock);
 	rcu_read_unlock();
 	return ret;
 }