X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=bafb225f1e4e5314e9eb9fa503ced0fdf1ceb6a6;hb=5125624336e1e27be5a6e85f848c976a65466d5d;hp=d2e78345a7f17e878c0dfe5715f289b431d398c8;hpb=90d4cb3a9a09396e8d26214bf6826fa3f89f93f3;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index d2e78345a..bafb225f1 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2785,6 +2785,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,
@@ -2796,7 +2798,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 = "";
@@ -2882,7 +2883,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
@@ -2891,7 +2891,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;
@@ -2900,9 +2900,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,