projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.lttng.org/lttng-tools
[lttng-tools.git]
/
src
/
common
/
consumer.c
diff --git
a/src/common/consumer.c
b/src/common/consumer.c
index 9c54b84cf963bb5f0ae853248023216f0d7e1cdb..e7d51078e64b9b5209d4e8208a61a25d9e0bef38 100644
(file)
--- a/
src/common/consumer.c
+++ b/
src/common/consumer.c
@@
-19,7
+19,6
@@
#define _GNU_SOURCE
#include <assert.h>
#define _GNU_SOURCE
#include <assert.h>
-#include <fcntl.h>
#include <poll.h>
#include <pthread.h>
#include <stdlib.h>
#include <poll.h>
#include <pthread.h>
#include <stdlib.h>
@@
-623,7
+622,7
@@
void lttng_consumer_sync_trace_file(
if (orig_offset < stream->chan->max_sb_size) {
return;
}
if (orig_offset < stream->chan->max_sb_size) {
return;
}
- sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
+
lttng_
sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
stream->chan->max_sb_size,
SYNC_FILE_RANGE_WAIT_BEFORE
| SYNC_FILE_RANGE_WRITE
stream->chan->max_sb_size,
SYNC_FILE_RANGE_WAIT_BEFORE
| SYNC_FILE_RANGE_WRITE
@@
-791,6
+790,8
@@
ssize_t lttng_consumer_on_read_subbuffer_mmap(
ERR("Unknown consumer_data type");
assert(0);
}
ERR("Unknown consumer_data type");
assert(0);
}
+
+ return 0;
}
/*
}
/*
This page took
0.027302 seconds
and
4
git commands to generate.