X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=902fcab8e4c93a00933b93477a2ccf1ed54a1401;hb=e40c873f0b555d4280c7fc01dca882069c42739c;hp=e3e88c9081bc572832ff416ba626de38c72b58bf;hpb=c92b20c7f29cb7816669037a03d2d66e9f48898a;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index e3e88c908..902fcab8e 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -48,6 +48,7 @@
 #include <common/sessiond-comm/relayd.h>
 #include <common/uri.h>
 #include <common/utils.h>
+#include <common/path.h>
 #include <common/align.h>
 #include <common/config/session-config.h>
 #include <common/dynamic-buffer.h>
@@ -1748,24 +1749,6 @@ static int relay_close_stream(const struct lttcomm_relayd_hdr *recv_hdr,
 	 *        request.
 	 */
 	try_stream_close(stream);
-	if (stream->is_metadata) {
-		struct relay_viewer_stream *vstream;
-
-		vstream = viewer_stream_get_by_id(stream->stream_handle);
-		if (vstream) {
-			if (stream->no_new_metadata_notified) {
-				/*
-				 * Since all the metadata has been sent to the
-				 * viewer and that we have a request to close
-				 * its stream, we can safely teardown the
-				 * corresponding metadata viewer stream.
-				 */
-				viewer_stream_put(vstream);
-			}
-			/* Put local reference. */
-			viewer_stream_put(vstream);
-		}
-	}
 	stream_put(stream);
 	ret = 0;
 
@@ -2671,7 +2654,10 @@ static int relay_rotate_session_streams(
 		 */
 		next_trace_chunk = sessiond_trace_chunk_registry_get_chunk(
 				sessiond_trace_chunk_registry,
-				session->sessiond_uuid, session->id,
+				session->sessiond_uuid,
+				conn->session->id_sessiond.is_set ?
+					conn->session->id_sessiond.value :
+					conn->session->id,
 				rotate_streams.new_chunk_id.value);
 		if (!next_trace_chunk) {
 			char uuid_str[LTTNG_UUID_STR_LEN];
@@ -2803,6 +2789,8 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	msg->creation_timestamp = be64toh(msg->creation_timestamp);
 	msg->override_name_length = be32toh(msg->override_name_length);
 
+	pthread_mutex_lock(&conn->session->lock);
+	session->ongoing_rotation = true;
 	if (session->current_trace_chunk &&
 			!lttng_trace_chunk_get_name_overridden(session->current_trace_chunk)) {
 		chunk_status = lttng_trace_chunk_rename_path(session->current_trace_chunk,
@@ -2814,7 +2802,6 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 			goto end;
 		}
 	}
-	session->ongoing_rotation = true;
 	if (!session->current_trace_chunk) {
 		if (!session->has_rotated) {
 			new_path = "";
@@ -2885,7 +2872,9 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	published_chunk = sessiond_trace_chunk_registry_publish_chunk(
 			sessiond_trace_chunk_registry,
 			conn->session->sessiond_uuid,
-			conn->session->id,
+			conn->session->id_sessiond.is_set ?
+				conn->session->id_sessiond.value :
+				conn->session->id,
 			chunk);
 	if (!published_chunk) {
 		char uuid_str[LTTNG_UUID_STR_LEN];
@@ -2900,7 +2889,6 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		goto end;
 	}
 
-	pthread_mutex_lock(&conn->session->lock);
 	if (conn->session->pending_closure_trace_chunk) {
 		/*
 		 * Invalid; this means a second create_trace_chunk command was
@@ -2909,7 +2897,7 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		ERR("Invalid trace chunk close command received; a trace chunk is already waiting for a trace chunk close command");
 		reply_code = LTTNG_ERR_INVALID_PROTOCOL;
 		ret = -1;
-		goto end_unlock_session;
+		goto end;
 	}
 	conn->session->pending_closure_trace_chunk =
 			conn->session->current_trace_chunk;
@@ -2918,9 +2906,8 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	if (!conn->session->pending_closure_trace_chunk) {
 		session->ongoing_rotation = false;
 	}
-end_unlock_session:
-	pthread_mutex_unlock(&conn->session->lock);
 end:
+	pthread_mutex_unlock(&conn->session->lock);
 	reply.ret_code = htobe32((uint32_t) reply_code);
 	send_ret = conn->sock->ops->sendmsg(conn->sock,
 			&reply,
@@ -2995,7 +2982,9 @@ static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	chunk = sessiond_trace_chunk_registry_get_chunk(
 			sessiond_trace_chunk_registry,
 			conn->session->sessiond_uuid,
-			conn->session->id,
+			conn->session->id_sessiond.is_set ?
+				conn->session->id_sessiond.value :
+				conn->session->id,
 			chunk_id);
 	if (!chunk) {
 		char uuid_str[LTTNG_UUID_STR_LEN];