From: Julien Desfossez Date: Tue, 13 Aug 2013 21:40:28 +0000 (-0400) Subject: Fix: reset out_fd_offset when we rotate the trace file X-Git-Tag: v2.3.0-rc3~50 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=a1ae300ff3a139f4d4f593eddf444b0fca52280f;hp=a8621b72212889dd024bb39cdb3bab7d54e73e19;ds=sidebyside Fix: reset out_fd_offset when we rotate the trace file This value is only used for the sync_file_range, but it has to be set to 0 when we start to write in a new trace file, otherwise the values passed to this call are bogus. Applied to 2.3, but could probably be backported to 2.2. Acked-by: Mathieu Desnoyers Signed-off-by: Julien Desfossez Signed-off-by: David Goulet --- diff --git a/src/common/consumer.c b/src/common/consumer.c index 221c348df..59207da2f 100644 --- a/src/common/consumer.c +++ b/src/common/consumer.c @@ -1431,6 +1431,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap( outfd = stream->out_fd = ret; /* Reset current size because we just perform a rotation. */ stream->tracefile_size_current = 0; + stream->out_fd_offset = 0; + orig_offset = 0; } stream->tracefile_size_current += len; } @@ -1614,6 +1616,8 @@ ssize_t lttng_consumer_on_read_subbuffer_splice( outfd = stream->out_fd = ret; /* Reset current size because we just perform a rotation. */ stream->tracefile_size_current = 0; + stream->out_fd_offset = 0; + orig_offset = 0; } stream->tracefile_size_current += len; }