X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-timer.c;h=44fdc879f15ead4911947ca5d20a6a2ee02f8eeb;hp=aba2bbb41568edd36f010995dcaa0287a3ad775e;hb=fa29bfbf73e837b936d80b4d5a1206dfb8496f07;hpb=3c215c837498a125ac4a981447368c30fbd92bb4

diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c
index aba2bbb41..44fdc879f 100644
--- a/src/common/consumer/consumer-timer.c
+++ b/src/common/consumer/consumer-timer.c
@@ -68,7 +68,7 @@ static void setmask(sigset_t *mask)
 	}
 }
 
-static int channel_monitor_pipe = -1;
+static int the_channel_monitor_pipe = -1;
 
 /*
  * Execute action on a timer switch.
@@ -271,7 +271,7 @@ static void live_timer(struct lttng_consumer_local_data *ctx,
 	struct lttng_consumer_channel *channel;
 	struct lttng_consumer_stream *stream;
 	struct lttng_ht_iter iter;
-	const struct lttng_ht *ht = consumer_data.stream_per_chan_id_ht;
+	const struct lttng_ht *ht = the_consumer_data.stream_per_chan_id_ht;
 	const flush_index_cb flush_index =
 			ctx->type == LTTNG_CONSUMER_KERNEL ?
 					consumer_flush_kernel_index :
@@ -570,7 +570,7 @@ int sample_channel_positions(struct lttng_consumer_channel *channel,
 	struct lttng_consumer_stream *stream;
 	bool empty_channel = true;
 	uint64_t high = 0, low = UINT64_MAX;
-	struct lttng_ht *ht = consumer_data.stream_per_chan_id_ht;
+	struct lttng_ht *ht = the_consumer_data.stream_per_chan_id_ht;
 
 	*_total_consumed = 0;
 
@@ -657,7 +657,7 @@ void monitor_timer(struct lttng_consumer_channel *channel)
 		return;
 	}
 
-	switch (consumer_data.type) {
+	switch (the_consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		sample = lttng_kconsumer_sample_snapshot_positions;
 		get_consumed = lttng_kconsumer_get_consumed_snapshot;
@@ -708,14 +708,14 @@ void monitor_timer(struct lttng_consumer_channel *channel)
 
 int consumer_timer_thread_get_channel_monitor_pipe(void)
 {
-	return uatomic_read(&channel_monitor_pipe);
+	return uatomic_read(&the_channel_monitor_pipe);
 }
 
 int consumer_timer_thread_set_channel_monitor_pipe(int fd)
 {
 	int ret;
 
-	ret = uatomic_cmpxchg(&channel_monitor_pipe, -1, fd);
+	ret = uatomic_cmpxchg(&the_channel_monitor_pipe, -1, fd);
 	if (ret != -1) {
 		ret = -1;
 		goto end;