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

consumerd: lttng_consumer_stream: 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: I1b8075c3ab3bdda7a345c3278ee251c6f6ee1023
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 295ea2726..22559052d 100644
--- a/src/common/consumer/consumer.cpp
+++ b/src/common/consumer/consumer.cpp
@@ -2414,7 +2414,7 @@ void *consumer_thread_metadata_poll(void *data)
 			node = lttng_ht_iter_get_node<lttng_ht_node_u64>(&iter);
 			LTTNG_ASSERT(node);
 
-			stream = caa_container_of(node, struct lttng_consumer_stream, node);
+			stream = lttng::utils::container_of(node, &lttng_consumer_stream::node);
 
 			if (revents & (LPOLLIN | LPOLLPRI)) {
 				/* Get the data out of the metadata file descriptor */