X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=445f432e416a60f584516770c96bf3d278685d2b;hb=ca741d243ae877c1acfaaadafbf4e7d98cea7c48;hp=831d760ae57baa2d178fb4e2378ee6387d234968;hpb=d227d5bd12acbff5cb7e703f9bed139e066a2033;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 831d760ae..445f432e4 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -153,32 +153,33 @@ ssize_t send_response(struct lttcomm_sock *sock, void *buf, size_t size)
 }
 
 /*
- * Atomically check if new streams got added in the session since the last
- * check and reset the flag to 0.
+ * Atomically check if new streams got added in one of the sessions attached
+ * and reset the flag to 0.
  *
  * Returns 1 if new streams got added, 0 if nothing changed, a negative value
  * on error.
  */
 static
-int check_new_streams(uint64_t session_id, struct lttng_ht *sessions_ht)
+int check_new_streams(struct relay_connection *conn)
 {
-	int ret;
-	unsigned long current_val;
 	struct relay_session *session;
+	unsigned long current_val;
+	int ret = 0;
 
-	assert(sessions_ht);
-
-	session = session_find_by_id(sessions_ht, session_id);
-	if (!session) {
-		DBG("Relay session %" PRIu64 " not found", session_id);
-		ret = -1;
-		goto error;
+	if (!conn->viewer_session) {
+		goto end;
+	}
+	cds_list_for_each_entry(session,
+			&conn->viewer_session->sessions_head,
+			viewer_session_list) {
+		current_val = uatomic_cmpxchg(&session->new_streams, 1, 0);
+		ret = current_val;
+		if (ret == 1) {
+			goto end;
+		}
 	}
 
-	current_val = uatomic_cmpxchg(&session->new_streams, 1, 0);
-	ret = current_val;
-
-error:
+end:
 	return ret;
 }
 
@@ -349,7 +350,7 @@ void stop_threads(void)
 
 	/* Stopping all threads */
 	DBG("Terminating all live threads");
-	ret = notify_thread_pipe(live_conn_pipe[1]);
+	ret = notify_thread_pipe(thread_quit_pipe[1]);
 	if (ret < 0) {
 		ERR("write error on thread quit pipe");
 	}
@@ -378,7 +379,7 @@ int create_thread_poll_set(struct lttng_poll_event *events, int size)
 	}
 
 	/* Add quit pipe */
-	ret = lttng_poll_add(events, live_conn_pipe[0], LPOLLIN | LPOLLERR);
+	ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
 	if (ret < 0) {
 		goto error;
 	}
@@ -395,9 +396,9 @@ error:
  * Return 1 if it was triggered else 0;
  */
 static
-int check_live_conn_pipe(int fd, uint32_t events)
+int check_thread_quit_pipe(int fd, uint32_t events)
 {
-	if (fd == live_conn_pipe[0] && (events & LPOLLIN)) {
+	if (fd == thread_quit_pipe[0] && (events & LPOLLIN)) {
 		return 1;
 	}
 
@@ -514,7 +515,7 @@ restart:
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
 			/* Thread quit pipe has been closed. Killing thread. */
-			ret = check_live_conn_pipe(pollfd, revents);
+			ret = check_thread_quit_pipe(pollfd, revents);
 			if (ret) {
 				err = 0;
 				goto exit;
@@ -1249,7 +1250,7 @@ int viewer_get_next_index(struct relay_connection *conn)
 		viewer_index.flags |= LTTNG_VIEWER_FLAG_NEW_METADATA;
 	}
 
-	ret = check_new_streams(vstream->session_id, conn->sessions_ht);
+	ret = check_new_streams(conn);
 	if (ret < 0) {
 		goto end_unlock;
 	} else if (ret == 1) {
@@ -1418,7 +1419,7 @@ int viewer_get_packet(struct relay_connection *conn)
 		goto send_reply;
 	}
 
-	ret = check_new_streams(stream->session_id, conn->sessions_ht);
+	ret = check_new_streams(conn);
 	if (ret < 0) {
 		goto end_unlock;
 	} else if (ret == 1) {
@@ -1853,7 +1854,7 @@ restart:
 			health_code_update();
 
 			/* Thread quit pipe has been closed. Killing thread. */
-			ret = check_live_conn_pipe(pollfd, revents);
+			ret = check_thread_quit_pipe(pollfd, revents);
 			if (ret) {
 				err = 0;
 				goto exit;