From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sat, 14 Sep 2019 18:25:25 +0000 (-0400)
Subject: consumer: fix: possible unaligned access in packed structure
X-Git-Tag: v2.11.0-rc4~42
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e890d98a8335c1c5440695eb807c52f5ed9edb04;p=lttng-tools.git

consumer: fix: possible unaligned access in packed structure

Fix the warnings that unaligned pointers can be passed as parameters
emitted when sampling buffer statistics.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c
index cfbf44312..7d000c145 100644
--- a/src/common/consumer/consumer-timer.c
+++ b/src/common/consumer/consumer-timer.c
@@ -721,6 +721,7 @@ void monitor_timer(struct lttng_consumer_channel *channel)
 	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);
 
@@ -744,11 +745,14 @@ void monitor_timer(struct lttng_consumer_channel *channel)
 		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