From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 19 May 2016 22:48:16 +0000 (-0400)
Subject: Fix: only perform lttng_consumer_sync_trace_file() in local mode
X-Git-Tag: v2.7.3~13
X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=b467859aba9a4835b1700c73c51c3528d7686c5b

Fix: only perform lttng_consumer_sync_trace_file() in local mode

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 69568c3c2..4bc2d2e9f 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -1669,8 +1669,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		lttng_sync_file_range(outfd, stream->out_fd_offset, len,
 				SYNC_FILE_RANGE_WRITE);
 		stream->out_fd_offset += len;
+		lttng_consumer_sync_trace_file(stream, orig_offset);
 	}
-	lttng_consumer_sync_trace_file(stream, orig_offset);
 
 write_error:
 	/*
@@ -1881,7 +1881,9 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 		stream->output_written += ret_splice;
 		written += ret_splice;
 	}
-	lttng_consumer_sync_trace_file(stream, orig_offset);
+	if (!relayd) {
+		lttng_consumer_sync_trace_file(stream, orig_offset);
+	}
 	goto end;
 
 write_error: