projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: only perform lttng_consumer_sync_trace_file() in local mode
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.c
diff --git
a/src/common/consumer/consumer.c
b/src/common/consumer/consumer.c
index 6773fbae868af95b5634d0d63d6724519caa7cdf..e182c991f147baf89bcb482da2ff9b4936d775b6 100644
(file)
--- a/
src/common/consumer/consumer.c
+++ b/
src/common/consumer/consumer.c
@@
-1229,6
+1229,11
@@
void lttng_consumer_should_exit(struct lttng_consumer_local_data *ctx)
DBG("Consumer flag that it should quit");
}
DBG("Consumer flag that it should quit");
}
+
+/*
+ * Flush pending writes to trace output disk file.
+ */
+static
void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
off_t orig_offset)
{
void lttng_consumer_sync_trace_file(struct lttng_consumer_stream *stream,
off_t orig_offset)
{
@@
-1687,8
+1692,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_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:
/*
write_error:
/*
@@
-1917,7
+1922,9
@@
ssize_t lttng_consumer_on_read_subbuffer_splice(
stream->output_written += ret_splice;
written += ret_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:
goto end;
write_error:
This page took
0.023854 seconds
and
4
git commands to generate.