X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-stream.c;h=5ab7be790de867f42676f8c6c84bd2e86bfb7083;hb=56611b069e7d0a64148cd990f88b4090298a9a0f;hp=8ed84a1d118163d7a74c5f2e47b7c9a5a29b0ded;hpb=878c34cf4708a7b7d52d4e2ea1bdda853ba6a790;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 8ed84a1d1..5ab7be790 100644
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -196,6 +196,7 @@ end:
 /*
  * Rotate a stream to the next tracefile.
  *
+ * Must be called with viewer_stream_rotation_lock held.
  * Returns 0 on success, 1 on EOF, a negative value on error.
  */
 int viewer_stream_rotate(struct relay_viewer_stream *vstream,
@@ -224,12 +225,6 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream,
 		goto end;
 	}
 
-	/*
-	 * Lock to execute rotation in order to avoid races between a modification
-	 * on the index values.
-	 */
-	pthread_mutex_lock(&stream->viewer_stream_rotation_lock);
-
 	/*
 	 * The writer and the reader are not working in the same tracefile, we can
 	 * read up to EOF, we don't care about the total_index_received.
@@ -264,8 +259,6 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream,
 	vstream->abort_flag = 0;
 	pthread_mutex_unlock(&vstream->overwrite_lock);
 
-	pthread_mutex_unlock(&stream->viewer_stream_rotation_lock);
-
 	ret = index_open(vstream->path_name, vstream->channel_name,
 			vstream->tracefile_count, vstream->tracefile_count_current);
 	if (ret < 0) {