X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=25194460645d377ad5d0680417629f1f69d2f40b;hb=ecd0f96d0a98fde1e7760a8ec80df8e792a8cbcc;hp=ced965dee34aa435828eb7484aa8d058d56bb4d3;hpb=05dac5980b42afe7b0334b009f43b4e3ba98a319;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index ced965dee..251944606 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -992,6 +992,8 @@ error:
 /*
  * Send relayd socket to consumer associated with a session name.
  *
+ * The consumer socket lock must be held by the caller.
+ *
  * On success return positive value. On error, negative value.
  */
 int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
@@ -1066,6 +1068,7 @@ int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE;
 
+	pthread_mutex_lock(consumer_sock->lock);
 	DBG3("Sending set_channel_monitor_pipe command to consumer");
 	ret = consumer_send_msg(consumer_sock, &msg);
 	if (ret < 0) {
@@ -1081,6 +1084,7 @@ int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
 
 	DBG2("Channel monitoring pipe successfully sent");
 error:
+	pthread_mutex_unlock(consumer_sock->lock);
 	return ret;
 }