X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=562a7fa522017ae4126d2d7b76847fbed9f81dc6;hb=8de4f9412d9681725c48f984c9e160773fdcf8c9;hp=756efbedef8434c7126148a7fbdb09e28c57e1e5;hpb=fd20dac985126e84929d657f5a1042222c7d5017;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 756efbede..562a7fa52 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();
@@ -1858,13 +1863,13 @@ void *thread_worker(void *data)
 {
 	int ret, err = -1;
 	uint32_t nb_fd;
-	struct relay_connection *conn;
 	struct lttng_poll_event events;
 	struct lttng_ht *relay_connections_ht;
 	struct lttng_ht_iter iter;
 	struct lttng_viewer_cmd recv_hdr;
 	struct relay_local_data *relay_ctx = (struct relay_local_data *) data;
 	struct lttng_ht *sessions_ht = relay_ctx->sessions_ht;
+	struct relay_connection *destroy_conn;
 
 	DBG("[thread] Live viewer relay worker started");
 
@@ -1945,6 +1950,8 @@ restart:
 					ERR("Relay live pipe error");
 					goto error;
 				} else if (revents & LPOLLIN) {
+					struct relay_connection *conn;
+
 					ret = lttng_read(live_conn_pipe[0], &conn, sizeof(conn));
 					if (ret < 0) {
 						goto error;
@@ -1960,6 +1967,8 @@ restart:
 					DBG("Connection socket %d added", conn->sock->fd);
 				}
 			} else {
+				struct relay_connection *conn;
+
 				rcu_read_lock();
 				conn = connection_find_by_sock(relay_connections_ht, pollfd);
 				/* If not found, there is a synchronization issue. */
@@ -1997,10 +2006,11 @@ error:
 
 	/* Cleanup reamaining connection object. */
 	rcu_read_lock();
-	cds_lfht_for_each_entry(relay_connections_ht->ht, &iter.iter, conn,
+	cds_lfht_for_each_entry(relay_connections_ht->ht, &iter.iter,
+			destroy_conn,
 			sock_n.node) {
 		health_code_update();
-		destroy_connection(relay_connections_ht, conn);
+		destroy_connection(relay_connections_ht, destroy_conn);
 	}
 	rcu_read_unlock();
 error_poll_create:
@@ -2102,7 +2112,10 @@ int relayd_live_create(struct lttng_uri *uri,
 	cds_wfcq_init(&viewer_conn_queue.head, &viewer_conn_queue.tail);
 
 	/* Set up max poll set size */
-	lttng_poll_set_max_size();
+	if (lttng_poll_set_max_size()) {
+		retval = -1;
+		goto exit_init_data;
+	}
 
 	/* Setup the dispatcher thread */
 	ret = pthread_create(&live_dispatcher_thread, NULL,
@@ -2139,13 +2152,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);