X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-timer.c;h=b0a434284a87d888f631b3fc8f0d435fc4c1d888;hb=32af2c95c9494c282804964aed17bb2d57887505;hp=3c9b3feb7d47f48820dcdbdb7d1b9cf819b98014;hpb=c8fea79c745d42ea8143b7020ae11b4fc2da0d8a;p=lttng-tools.git diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c index 3c9b3feb7..b0a434284 100644 --- 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) { - if (errno != EAGAIN && errno != ENODATA) { + if (ret != -EAGAIN && ret != -ENODATA) { 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; - its.it_value.tv_nsec = switch_timer_interval % 1000000; + its.it_value.tv_nsec = (switch_timer_interval % 1000000) * 1000; 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; - its.it_value.tv_nsec = live_timer_interval % 1000000; + its.it_value.tv_nsec = (live_timer_interval % 1000000) * 1000; its.it_interval.tv_sec = its.it_value.tv_sec; its.it_interval.tv_nsec = its.it_value.tv_nsec;