X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-timer.c;h=7d000c145494fba7250e8901cd7d304e86936492;hb=ef4b086ef18cd4128c52c4bf58e5ce64d2df0ee6;hp=9c10ddd251bce7f63060073340431374c8c0c9b8;hpb=d7e2822fb3e1f7c0f936949891e0c4643cc2f673;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c
index 9c10ddd25..7d000c145 100644
--- a/src/common/consumer/consumer-timer.c
+++ b/src/common/consumer/consumer-timer.c
@@ -710,8 +710,7 @@ end:
  * Execute action on a monitor timer.
  */
 static
-void monitor_timer(struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_channel *channel)
+void monitor_timer(struct lttng_consumer_channel *channel)
 {
 	int ret;
 	int channel_monitor_pipe =
@@ -722,6 +721,7 @@ void monitor_timer(struct lttng_consumer_local_data *ctx,
 	sample_positions_cb sample;
 	get_consumed_cb get_consumed;
 	get_produced_cb get_produced;
+	uint64_t lowest = 0, highest = 0, total_consumed = 0;
 
 	assert(channel);
 
@@ -745,11 +745,14 @@ void monitor_timer(struct lttng_consumer_local_data *ctx,
 		abort();
 	}
 
-	ret = sample_channel_positions(channel, &msg.highest, &msg.lowest,
-			&msg.total_consumed, sample, get_consumed, get_produced);
+	ret = sample_channel_positions(channel, &highest, &lowest,
+			&total_consumed, sample, get_consumed, get_produced);
 	if (ret) {
 		return;
 	}
+	msg.highest = highest;
+	msg.lowest = lowest;
+	msg.total_consumed = total_consumed;
 
 	/*
 	 * Writes performed here are assumed to be atomic which is only
@@ -850,7 +853,7 @@ void *consumer_timer_thread(void *data)
 			struct lttng_consumer_channel *channel;
 
 			channel = info.si_value.sival_ptr;
-			monitor_timer(ctx, channel);
+			monitor_timer(channel);
 		} else if (signr == LTTNG_CONSUMER_SIG_EXIT) {
 			assert(CMM_LOAD_SHARED(consumer_quit));
 			goto end;