sessiond: main.cpp: iterate on list using list_iteration_adapter

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

diff --git a/src/bin/lttng-sessiond/main.cpp b/src/bin/lttng-sessiond/main.cpp
index b5a42b5dcfdd9b1674bb1a1a2b375d7815065d91..0902969e71dee38b7319e007329e823e785afdc6 100644 (file)
--- a/src/bin/lttng-sessiond/main.cpp
+++ b/src/bin/lttng-sessiond/main.cpp
@@ -1279,7 +1279,6 @@ end:
 
 static void destroy_all_sessions_and_wait()
 {
-       struct ltt_session *raw_session_ptr, *tmp;
        struct ltt_session_list *session_list;
 
        DBG("Initiating destruction of all sessions");
@@ -1292,7 +1291,9 @@ static void destroy_all_sessions_and_wait()
        }
 
        /* Initiate the destruction of all sessions. */
-       cds_list_for_each_entry_safe (raw_session_ptr, tmp, &session_list->head, list) {
+       for (auto raw_session_ptr :
+            lttng::urcu::list_iteration_adapter<ltt_session, &ltt_session::list>(
+                    session_list->head)) {
                const auto session = [raw_session_ptr]() {
                        session_get(raw_session_ptr);
                        raw_session_ptr->lock();