X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=3ca1797ed9b07b12468840f0bcd963709f72a92b;hb=dbd6665b396de85a4d6b311c8942f82ea9813891;hp=8c4f501aa3446afd5b5cb5d7e72e42bf82dd2d11;hpb=d995f382e348c509c15673aba195c3ecb624391c;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 8c4f501aa..3ca1797ed 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -291,6 +291,13 @@ static int make_viewer_streams(struct relay_session *session,
 	assert(session);
 	ASSERT_LOCKED(session->lock);
 
+	if (!viewer_trace_chunk) {
+		ERR("Internal error: viewer session associated with session \"%s\" has a NULL trace chunk",
+				session->session_name);
+		ret = -1;
+		goto error;
+	}
+
 	if (session->connection_closed) {
 		*closed = true;
 	}
@@ -378,6 +385,7 @@ static int make_viewer_streams(struct relay_session *session,
 
 error_unlock:
 	rcu_read_unlock();
+error:
 	return ret;
 }
 
@@ -954,23 +962,11 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	}
 
 	if (!viewer_session_is_attached(conn->viewer_session, session)) {
-		send_streams = 0;
 		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_ERR);
 		goto send_reply;
 	}
 
-	send_streams = 1;
-	response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_OK);
-
 	pthread_mutex_lock(&session->lock);
-	if (!conn->viewer_session->current_trace_chunk &&
-			session->current_trace_chunk) {
-		ret = viewer_session_set_trace_chunk(conn->viewer_session,
-				session->current_trace_chunk);
-		if (ret) {
-			goto error_unlock_session;
-		}
-	}
 	ret = make_viewer_streams(session,
 			conn->viewer_session->current_trace_chunk,
 			LTTNG_VIEWER_SEEK_LAST, &nb_total, &nb_unsent,
@@ -978,7 +974,8 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	if (ret < 0) {
 		goto error_unlock_session;
 	}
-	pthread_mutex_unlock(&session->lock);
+	send_streams = 1;
+	response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_OK);
 
 	/* Only send back the newly created streams with the unsent ones. */
 	nb_streams = nb_created + nb_unsent;
@@ -992,8 +989,10 @@ int viewer_get_new_streams(struct relay_connection *conn)
 		send_streams = 0;
 		response.streams_count = 0;
 		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_HUP);
-		goto send_reply;
+		goto send_reply_unlock;
 	}
+send_reply_unlock:
+	pthread_mutex_unlock(&session->lock);
 
 send_reply:
 	health_code_update();
@@ -1047,6 +1046,7 @@ int viewer_attach_session(struct relay_connection *conn)
 	struct lttng_viewer_attach_session_request request;
 	struct lttng_viewer_attach_session_response response;
 	struct relay_session *session = NULL;
+	enum lttng_viewer_attach_return_code viewer_attach_status;
 	bool closed = false;
 	uint64_t session_id;
 
@@ -1080,6 +1080,15 @@ int viewer_attach_session(struct relay_connection *conn)
 	DBG("Attach session ID %" PRIu64 " received", session_id);
 
 	pthread_mutex_lock(&session->lock);
+	if (!session->current_trace_chunk) {
+		/*
+		 * Session is either being destroyed or it never had a trace
+		 * chunk created against it.
+		 */
+		DBG("Session requested by live client has no current trace chunk, returning unknown session");
+		response.status = htobe32(LTTNG_VIEWER_ATTACH_UNK);
+		goto send_reply;
+	}
 	if (session->live_timer == 0) {
 		DBG("Not live session");
 		response.status = htobe32(LTTNG_VIEWER_ATTACH_NOT_LIVE);
@@ -1087,10 +1096,10 @@ int viewer_attach_session(struct relay_connection *conn)
 	}
 
 	send_streams = 1;
-	ret = viewer_session_attach(conn->viewer_session, session);
-	if (ret) {
-		DBG("Already a viewer attached");
-		response.status = htobe32(LTTNG_VIEWER_ATTACH_ALREADY);
+	viewer_attach_status = viewer_session_attach(conn->viewer_session,
+			session);
+	if (viewer_attach_status != LTTNG_VIEWER_ATTACH_OK) {
+		response.status = htobe32(viewer_attach_status);
 		goto send_reply;
 	}
 
@@ -1107,14 +1116,6 @@ int viewer_attach_session(struct relay_connection *conn)
 		goto send_reply;
 	}
 
-	if (!conn->viewer_session->current_trace_chunk &&
-			session->current_trace_chunk) {
-		ret = viewer_session_set_trace_chunk(conn->viewer_session,
-				session->current_trace_chunk);
-		if (ret) {
-			goto end_put_session;
-		}
-	}
 	ret = make_viewer_streams(session,
 			conn->viewer_session->current_trace_chunk, seek_type,
 			&nb_streams, NULL, NULL, &closed);