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

diff --git a/src/bin/lttng-relayd/viewer-session.c b/src/bin/lttng-relayd/viewer-session.c
index a4b859726..7ff58ed96 100644
--- a/src/bin/lttng-relayd/viewer-session.c
+++ b/src/bin/lttng-relayd/viewer-session.c
@@ -47,12 +47,13 @@ int viewer_session_attach(struct relay_viewer_session *vsession,
 {
 	int ret = 0;
 
+	ASSERT_LOCKED(session->lock);
+
 	/* Will not fail, as per the ownership guarantee. */
 	if (!session_get(session)) {
 		ret = -1;
 		goto end;
 	}
-	pthread_mutex_lock(&session->lock);
 	if (session->viewer_attached) {
 		ret = -1;
 	} else {
@@ -69,8 +70,6 @@ int viewer_session_attach(struct relay_viewer_session *vsession,
 		/* Put our local ref. */
 		session_put(session);
 	}
-	/* Safe since we know the session exists. */
-	pthread_mutex_unlock(&session->lock);
 end:
 	return ret;
 }
@@ -102,6 +101,7 @@ static int viewer_session_detach(struct relay_viewer_session *vsession,
 
 void viewer_session_destroy(struct relay_viewer_session *vsession)
 {
+	lttng_trace_chunk_put(vsession->current_trace_chunk);
 	free(vsession);
 }
 
@@ -184,3 +184,25 @@ 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;
+}