projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: notify the viewer if new streams got added
[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 8e6cb4d28a86ef35f59094c00774b177f1369cd3..380b4f833042cad3dcf7809e1871016fda753506 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-1165,6
+1165,10
@@
int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr,
reply.session_id = htobe64(session->id);
switch (cmd->minor) {
reply.session_id = htobe64(session->id);
switch (cmd->minor) {
+ case 1:
+ case 2:
+ case 3:
+ break;
case 4: /* LTTng sessiond 2.4 */
default:
ret = cmd_create_session_2_4(cmd, session);
case 4: /* LTTng sessiond 2.4 */
default:
ret = cmd_create_session_2_4(cmd, session);
@@
-1346,11
+1350,7
@@
int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
* stream message is received, this list is emptied and streams are set
* with the viewer ready flag.
*/
* stream message is received, this list is emptied and streams are set
* with the viewer ready flag.
*/
- if (stream->metadata_flag) {
- stream->viewer_ready = 1;
- } else {
- queue_stream_handle(stream->stream_handle, cmd);
- }
+ queue_stream_handle(stream->stream_handle, cmd);
lttng_ht_node_init_ulong(&stream->stream_n,
(unsigned long) stream->stream_handle);
lttng_ht_node_init_ulong(&stream->stream_n,
(unsigned long) stream->stream_handle);
@@
-2128,6
+2128,11
@@
int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr,
*/
set_viewer_ready_flag(cmd);
*/
set_viewer_ready_flag(cmd);
+ /*
+ * Inform the viewer that there are new streams in the session.
+ */
+ uatomic_set(&cmd->session->new_streams, 1);
+
reply.ret_code = htobe32(LTTNG_OK);
send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
if (send_ret < 0) {
reply.ret_code = htobe32(LTTNG_OK);
send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
if (send_ret < 0) {
This page took
0.024013 seconds
and
4
git commands to generate.