X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=a2258f409ad1a9ef8b773446da01205800458f12;hb=1b0afea26b25d92ebdcb2a178bd1a60085ff78aa;hp=fe2c8f4c8055b41048e6b9645ab7e2e2572f5c21;hpb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index fe2c8f4c8..a2258f409 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -192,6 +192,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_sess->id,
 			ua_sess->output_traces,
 			ua_sess->uid,
+			ua_chan->attr.blocking_timeout,
 			root_shm_path, shm_path);
 
 	health_code_update();
@@ -320,7 +321,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
 				DBG3("UST app consumer has no more stream available");
-				ret = 0;
 				break;
 			}
 			if (ret != -EPIPE) {
@@ -505,7 +505,9 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 
 			memset(&msg, 0, sizeof(msg));
 			msg.cmd_type = LTTNG_ERR_UND;
+			pthread_mutex_lock(socket->lock);
 			(void) consumer_send_msg(socket, &msg);
+			pthread_mutex_unlock(socket->lock);
 			/*
 			 * This is possible since the session might have been destroyed
 			 * during a consumer metadata request. So here, return gracefully