X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=70a1948c328cc690e39e4add4d67f4a2a8f2fe44;hp=5782175e6e7f15b57753cc29dedebd54db7a51da;hb=cef0f7d51b8025d3ba04e6496242c1cca1641aa6;hpb=cc7f9e363bf9230260b2ef27c84e24f75a7535c0

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 5782175e6..70a1948c3 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -849,7 +849,10 @@ static void destroy_stream(struct relay_stream *stream)
 		 * lookup failure on the live thread side of a stream indicates
 		 * that the viewer stream index received value should be used.
 		 */
+		pthread_mutex_lock(&stream->viewer_stream_rotation_lock);
 		vstream->total_index_received = stream->total_index_received;
+		vstream->close_write_flag = 1;
+		pthread_mutex_unlock(&stream->viewer_stream_rotation_lock);
 	}
 
 	/* Cleanup index of that stream. */
@@ -2065,18 +2068,9 @@ int relay_process_data(struct relay_command *cmd)
 			 * currently using and let it handle the fault.
 			 */
 			if (vstream->tracefile_count_current == new_id) {
+				pthread_mutex_lock(&vstream->overwrite_lock);
 				vstream->abort_flag = 1;
-				vstream->close_write_flag = 1;
-
-				ret = close(vstream->read_fd);
-				if (ret < 0) {
-					PERROR("close index");
-				}
-
-				ret = close(vstream->index_read_fd);
-				if (ret < 0) {
-					PERROR("close tracefile");
-				}
+				pthread_mutex_unlock(&vstream->overwrite_lock);
 				DBG("Streaming side setting abort_flag on stream %s_%lu\n",
 						stream->channel_name, new_id);
 			} else if (vstream->tracefile_count_current ==
@@ -2094,6 +2088,7 @@ int relay_process_data(struct relay_command *cmd)
 				stream->tracefile_size, stream->tracefile_count,
 				relayd_uid, relayd_gid, stream->fd,
 				&(stream->tracefile_count_current), &stream->fd);
+		stream->total_index_received = 0;
 		pthread_mutex_unlock(&stream->viewer_stream_rotation_lock);
 		if (ret < 0) {
 			ERR("Rotating stream output file");