projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: unpublish stream on close
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 7b385b49f5264e2ace8823ffbc0f8fe4747630a5..fe52702c77489209dcb43208206bb6e7dd1fb04c 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-1266,9
+1266,17
@@
static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+
+ /*
+ * Set last_net_seq_num before the close flag. Required by data
+ * pending check.
+ */
pthread_mutex_lock(&stream->lock);
pthread_mutex_lock(&stream->lock);
- stream->closed = true;
stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num);
stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num);
+ pthread_mutex_unlock(&stream->lock);
+
+ stream_close(stream);
+
if (stream->is_metadata) {
struct relay_viewer_stream *vstream;
if (stream->is_metadata) {
struct relay_viewer_stream *vstream;
@@
-1287,7
+1295,6
@@
static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
viewer_stream_put(vstream);
}
}
viewer_stream_put(vstream);
}
}
- pthread_mutex_unlock(&stream->lock);
stream_put(stream);
end:
stream_put(stream);
end:
This page took
0.024317 seconds
and
4
git commands to generate.