projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't send error to sessiond on orderly shutdown
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index ff4ba25b9730f0a2896ef798e8869ca7c09aa1cc..4a7c6db1a69a5ac146f20e9a8b80978ba1f1b1fb 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-152,7
+152,8
@@
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
channel->session_id,
cpu,
&alloc_ret,
channel->session_id,
cpu,
&alloc_ret,
- channel->type);
+ channel->type,
+ channel->monitor);
if (stream == NULL) {
switch (alloc_ret) {
case -ENOENT:
if (stream == NULL) {
switch (alloc_ret) {
case -ENOENT:
@@
-559,6
+560,12
@@
static int send_streams_to_thread(struct lttng_consumer_channel *channel,
/* Remove node from the channel stream list. */
cds_list_del(&stream->send_node);
/* Remove node from the channel stream list. */
cds_list_del(&stream->send_node);
+
+ /*
+ * From this point on, the stream's ownership has been moved away from
+ * the channel and becomes globally visible.
+ */
+ stream->globally_visible = 1;
}
error:
}
error:
@@
-1108,12
+1115,12
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
if (ret != sizeof(msg)) {
DBG("Consumer received unexpected message size %zd (expects %zu)",
ret, sizeof(msg));
if (ret != sizeof(msg)) {
DBG("Consumer received unexpected message size %zd (expects %zu)",
ret, sizeof(msg));
- lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD);
/*
* The ret value might 0 meaning an orderly shutdown but this is ok
* since the caller handles this.
*/
if (ret > 0) {
/*
* The ret value might 0 meaning an orderly shutdown but this is ok
* since the caller handles this.
*/
if (ret > 0) {
+ lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD);
ret = -1;
}
return ret;
ret = -1;
}
return ret;
This page took
0.024286 seconds
and
5
git commands to generate.