projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer socket lock not held during snapshot record
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index 5e723e9b3804e08335d3e16758486899ec79f83e..126b01a448c062e35095ddb97fd1eaf37e5dabb2 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-1068,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;
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) {
DBG3("Sending set_channel_monitor_pipe command to consumer");
ret = consumer_send_msg(consumer_sock, &msg);
if (ret < 0) {
@@
-1083,6
+1084,7
@@
int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
DBG2("Channel monitoring pipe successfully sent");
error:
DBG2("Channel monitoring pipe successfully sent");
error:
+ pthread_mutex_unlock(consumer_sock->lock);
return ret;
}
return ret;
}
@@
-1440,7
+1442,9
@@
int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
}
health_code_update();
}
health_code_update();
+ pthread_mutex_lock(socket->lock);
ret = consumer_send_msg(socket, &msg);
ret = consumer_send_msg(socket, &msg);
+ pthread_mutex_unlock(socket->lock);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
This page took
0.02653 seconds
and
5
git commands to generate.