X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-session.c;h=1d9fdf47a43d2a95cbf01d6aae56d16250e9b21c;hp=7ff58ed967842b75881a43c7de4fa5f029cc23fe;hb=9c256b0146b021962e93fda7400c61ceb2b0d45f;hpb=b66a15d11378bcc42817fcfb8f0aff663e770ba2

diff --git a/src/bin/lttng-relayd/viewer-session.c b/src/bin/lttng-relayd/viewer-session.c
index 7ff58ed96..1d9fdf47a 100644
--- a/src/bin/lttng-relayd/viewer-session.c
+++ b/src/bin/lttng-relayd/viewer-session.c
@@ -41,26 +41,68 @@ end:
 	return vsession;
 }
 
+int viewer_session_set_trace_chunk_copy(struct relay_viewer_session *vsession,
+		struct lttng_trace_chunk *relay_session_trace_chunk)
+{
+	int ret = 0;
+	struct lttng_trace_chunk *viewer_chunk;
+
+	assert(relay_session_trace_chunk);
+	assert(!vsession->current_trace_chunk);
+
+	DBG("Copying relay session's current trace chunk to the viewer session");
+	viewer_chunk = lttng_trace_chunk_copy(relay_session_trace_chunk);
+	if (!viewer_chunk) {
+		ERR("Failed to create a viewer trace chunk from the relay session's current chunk");
+		ret = -1;
+		goto end;
+	}
+
+	vsession->current_trace_chunk = viewer_chunk;
+end:
+	return ret;
+}
+
 /* The existence of session must be guaranteed by the caller. */
-int viewer_session_attach(struct relay_viewer_session *vsession,
+enum lttng_viewer_attach_return_code viewer_session_attach(
+		struct relay_viewer_session *vsession,
 		struct relay_session *session)
 {
-	int ret = 0;
+	enum lttng_viewer_attach_return_code viewer_attach_status =
+			LTTNG_VIEWER_ATTACH_OK;
 
 	ASSERT_LOCKED(session->lock);
 
 	/* Will not fail, as per the ownership guarantee. */
 	if (!session_get(session)) {
-		ret = -1;
+		viewer_attach_status = LTTNG_VIEWER_ATTACH_UNK;
 		goto end;
 	}
 	if (session->viewer_attached) {
-		ret = -1;
+		viewer_attach_status = LTTNG_VIEWER_ATTACH_ALREADY;
 	} else {
+		int ret;
+
+		assert(session->current_trace_chunk);
+		assert(!vsession->current_trace_chunk);
 		session->viewer_attached = true;
+
+		ret = viewer_session_set_trace_chunk_copy(vsession,
+				session->current_trace_chunk);
+		if (ret) {
+			/*
+			 * The live protocol does not define a generic error
+			 * value for the "attach" command. The "unknown"
+			 * status is used so that the viewer may handle this
+			 * failure as if the session didn't exist anymore.
+			 */
+			DBG("Failed to create a viewer trace chunk from the current trace chunk of session \"%s\", returning LTTNG_VIEWER_ATTACH_UNK",
+					session->session_name);
+			viewer_attach_status = LTTNG_VIEWER_ATTACH_UNK;
+		}
 	}
 
-	if (!ret) {
+	if (viewer_attach_status == LTTNG_VIEWER_ATTACH_OK) {
 		pthread_mutex_lock(&vsession->session_list_lock);
 		/* Ownership is transfered to the list. */
 		cds_list_add_rcu(&session->viewer_session_node,
@@ -71,7 +113,7 @@ int viewer_session_attach(struct relay_viewer_session *vsession,
 		session_put(session);
 	}
 end:
-	return ret;
+	return viewer_attach_status;
 }
 
 /* The existence of session must be guaranteed by the caller. */
@@ -136,7 +178,8 @@ void viewer_session_close_one_session(struct relay_viewer_session *vsession,
 		 */
 		viewer_stream_put(vstream);
 	}
-
+	lttng_trace_chunk_put(vsession->current_trace_chunk);
+	vsession->current_trace_chunk = NULL;
 	viewer_session_detach(vsession, session);
 }
 
@@ -184,25 +227,3 @@ end:
 	pthread_mutex_unlock(&session->lock);
 	return found;
 }
-
-int viewer_session_set_trace_chunk(struct relay_viewer_session *vsession,
-		struct lttng_trace_chunk *relay_session_trace_chunk)
-{
-	int ret = 0;
-	struct lttng_trace_chunk *viewer_chunk;
-
-	assert(relay_session_trace_chunk);
-	assert(!vsession->current_trace_chunk);
-
-	DBG("Copying relay session's current trace chunk to the viewer session");
-	viewer_chunk = lttng_trace_chunk_copy(relay_session_trace_chunk);
-	if (!viewer_chunk) {
-		ERR("Failed to create a viewer trace chunk from the relay session's current chunk");
-		ret = -1;
-		goto end;
-	}
-
-	vsession->current_trace_chunk = viewer_chunk;
-end:
-	return ret;
-}