projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: only free trace_path when it is dynamically allocated
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index 43bf2616a2c4a93ba91f81f2a6f60476289dbe7c..a2258f409ad1a9ef8b773446da01205800458f12 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-321,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");
free(stream);
if (ret == -LTTNG_UST_ERR_NOENT) {
DBG3("UST app consumer has no more stream available");
- ret = 0;
break;
}
if (ret != -EPIPE) {
break;
}
if (ret != -EPIPE) {
@@
-506,7
+505,9
@@
int ust_consumer_metadata_request(struct consumer_socket *socket)
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_ERR_UND;
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_ERR_UND;
+ pthread_mutex_lock(socket->lock);
(void) consumer_send_msg(socket, &msg);
(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
/*
* This is possible since the session might have been destroyed
* during a consumer metadata request. So here, return gracefully
This page took
0.024317 seconds
and
4
git commands to generate.