From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 22 Jul 2024 20:12:01 +0000 (+0000)
Subject: consumerd: lttng_consumer_channel: use lttng::utils::container_of
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1af6d47e252162556e2f3633695aaedc589df9cc;p=lttng-tools.git

consumerd: lttng_consumer_channel: use lttng::utils::container_of

caa_container_of makes use of offsetof which is conditionally
supported for non-POD types. Replace its use by
lttng::utils::container_of.

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

diff --git a/src/common/consumer/consumer.cpp b/src/common/consumer/consumer.cpp
index 22559052d..e242f64b5 100644
--- a/src/common/consumer/consumer.cpp
+++ b/src/common/consumer/consumer.cpp
@@ -3070,7 +3070,7 @@ void *consumer_thread_channel_poll(void *data)
 			node = lttng_ht_iter_get_node<lttng_ht_node_u64>(&iter);
 			LTTNG_ASSERT(node);
 
-			chan = caa_container_of(node, struct lttng_consumer_channel, wait_fd_node);
+			chan = lttng::utils::container_of(node, &lttng_consumer_channel::wait_fd_node);
 
 			/* Check for error event */
 			if (revents & (LPOLLERR | LPOLLHUP)) {