From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Fri, 26 Jul 2024 19:17:26 +0000 (+0000)
Subject: relayd: viewer-stream.cpp: iterate on lfht using lfht_iteration_adapter
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=5498618330df95d954e6ca712ffcc982364890a1;p=lttng-tools.git

relayd: viewer-stream.cpp: iterate on lfht using lfht_iteration_adapter

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

diff --git a/src/bin/lttng-relayd/viewer-stream.cpp b/src/bin/lttng-relayd/viewer-stream.cpp
index e3061ec87..066571743 100644
--- a/src/bin/lttng-relayd/viewer-stream.cpp
+++ b/src/bin/lttng-relayd/viewer-stream.cpp
@@ -369,29 +369,25 @@ end:
 
 void print_viewer_streams()
 {
-	struct lttng_ht_iter iter;
-	struct relay_viewer_stream *vstream;
-
 	if (!viewer_streams_ht) {
 		return;
 	}
 
-	{
-		const lttng::urcu::read_lock_guard read_lock;
-
-		cds_lfht_for_each_entry (
-			viewer_streams_ht->ht, &iter.iter, vstream, stream_n.node) {
-			if (!viewer_stream_get(vstream)) {
-				continue;
-			}
-			DBG("vstream %p refcount %ld stream %" PRIu64 " trace %" PRIu64
-			    " session %" PRIu64,
-			    vstream,
-			    vstream->ref.refcount,
-			    vstream->stream->stream_handle,
-			    vstream->stream->trace->id,
-			    vstream->stream->trace->session->id);
-			viewer_stream_put(vstream);
+	for (auto *vstream :
+	     lttng::urcu::lfht_iteration_adapter<relay_viewer_stream,
+						 decltype(relay_viewer_stream::stream_n),
+						 &relay_viewer_stream::stream_n>(
+		     *viewer_streams_ht->ht)) {
+		if (!viewer_stream_get(vstream)) {
+			continue;
 		}
+
+		DBG("vstream %p refcount %ld stream %" PRIu64 " trace %" PRIu64 " session %" PRIu64,
+		    vstream,
+		    vstream->ref.refcount,
+		    vstream->stream->stream_handle,
+		    vstream->stream->trace->id,
+		    vstream->stream->trace->session->id);
+		viewer_stream_put(vstream);
 	}
 }