projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: protocol mismatch between UST and tools
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer-timer.c
diff --git
a/src/common/consumer/consumer-timer.c
b/src/common/consumer/consumer-timer.c
index 3c9b3feb7d47f48820dcdbdb7d1b9cf819b98014..b0a434284a87d888f631b3fc8f0d435fc4c1d888 100644
(file)
--- a/
src/common/consumer/consumer-timer.c
+++ b/
src/common/consumer/consumer-timer.c
@@
-148,7
+148,7
@@
int consumer_flush_kernel_index(struct lttng_consumer_stream *stream)
}
ret = kernctl_snapshot(stream->wait_fd);
if (ret < 0) {
}
ret = kernctl_snapshot(stream->wait_fd);
if (ret < 0) {
- if (
errno != EAGAIN && errno !=
ENODATA) {
+ if (
ret != -EAGAIN && ret != -
ENODATA) {
PERROR("live timer kernel snapshot");
ret = -1;
goto end;
PERROR("live timer kernel snapshot");
ret = -1;
goto end;
@@
-437,7
+437,7
@@
void consumer_timer_switch_start(struct lttng_consumer_channel *channel,
channel->switch_timer_enabled = 1;
its.it_value.tv_sec = switch_timer_interval / 1000000;
channel->switch_timer_enabled = 1;
its.it_value.tv_sec = switch_timer_interval / 1000000;
- its.it_value.tv_nsec =
switch_timer_interval % 1000
000;
+ its.it_value.tv_nsec =
(switch_timer_interval % 1000000) * 1
000;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
@@
-494,7
+494,7
@@
void consumer_timer_live_start(struct lttng_consumer_channel *channel,
channel->live_timer_enabled = 1;
its.it_value.tv_sec = live_timer_interval / 1000000;
channel->live_timer_enabled = 1;
its.it_value.tv_sec = live_timer_interval / 1000000;
- its.it_value.tv_nsec =
live_timer_interval % 1000
000;
+ its.it_value.tv_nsec =
(live_timer_interval % 1000000) * 1
000;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
its.it_interval.tv_sec = its.it_value.tv_sec;
its.it_interval.tv_nsec = its.it_value.tv_nsec;
This page took
0.025195 seconds
and
4
git commands to generate.