X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=b681ae763379deaa55d68da8f6113b7b99b87eb3;hb=99ed9c436a035b26c64b8efcbaec8b3d91d754d6;hp=7ece0f6a54a37eb97084e8973cecc63c59b8b8e3;hpb=9ce5646a7ef9b8d7936c46649a21ee546fadd538;p=lttng-tools.git diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c index 7ece0f6a5..b681ae763 100644 --- a/src/common/consumer-timer.c +++ b/src/common/consumer-timer.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include "consumer-timer.h" #include "ust-consumer/ust-consumer.h" -#include "../bin/lttng-consumerd/health-consumerd.h" static struct timer_signal_data timer_signal = { .tid = 0, @@ -115,7 +115,7 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx, static int send_empty_index(struct lttng_consumer_stream *stream, uint64_t ts) { int ret; - struct lttng_packet_index index; + struct ctf_packet_index index; memset(&index, 0, sizeof(index)); index.timestamp_end = htobe64(ts); @@ -397,7 +397,7 @@ void consumer_timer_live_start(struct lttng_consumer_channel *channel, assert(channel); assert(channel->key); - if (live_timer_interval == 0) { + if (live_timer_interval <= 0) { return; }