X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=ed52012407be36ef76a04d1c494a028d148bf6cd;hp=3728005df77c3efa3d7c9e20f5ca537db26940bf;hb=93b4787b203ca4286c29ed484684ed34c3c8fe5d;hpb=25b397f9ccee70eb6f2968837702c50f22ad7bbf

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 3728005df..ed5201240 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -712,7 +712,12 @@ int viewer_connect(struct relay_connection *conn)
 	reply.major = htobe32(reply.major);
 	reply.minor = htobe32(reply.minor);
 	if (conn->type == RELAY_VIEWER_COMMAND) {
-		reply.viewer_session_id = htobe64(++last_relay_viewer_session_id);
+		/*
+		 * Increment outside of htobe64 macro, because can be used more than once
+		 * within the macro, and thus the operation may be undefined.
+		 */
+		last_relay_viewer_session_id++;
+		reply.viewer_session_id = htobe64(last_relay_viewer_session_id);
 	}
 
 	health_code_update();
@@ -2142,13 +2147,11 @@ int relayd_live_create(struct lttng_uri *uri,
 	 */
 	return retval;
 
+	/*
+	 * Join on the live_listener_thread should anything be added after
+	 * the live_listener thread's creation.
+	 */
 
-	ret = pthread_join(live_listener_thread, &status);
-	if (ret) {
-		errno = ret;
-		PERROR("pthread_join live listener");
-		retval = -1;
-	}
 exit_listener_thread:
 
 	ret = pthread_join(live_worker_thread, &status);