sessiond: introduce ltt_session::locked_ref look-up functions

[lttng-tools.git] / src / bin / lttng-sessiond / main.cpp

diff --git a/src/bin/lttng-sessiond/main.cpp b/src/bin/lttng-sessiond/main.cpp
index 16d0721c1a27d455b16d96ed11a05ba1cf4aced4..6451899cd412ea2eaf330a1a95a98366e91abb88 100644 (file)
--- a/src/bin/lttng-sessiond/main.cpp
+++ b/src/bin/lttng-sessiond/main.cpp
@@ -1282,14 +1282,15 @@ static void destroy_all_sessions_and_wait()
        struct ltt_session *session, *tmp;
        struct ltt_session_list *session_list;
 
-       session_list = session_get_list();
        DBG("Initiating destruction of all sessions");
 
+       auto list_lock = lttng::sessiond::lock_session_list();
+
+       session_list = session_get_list();
        if (!session_list) {
                return;
        }
 
-       session_lock_list();
        /* Initiate the destruction of all sessions. */
        cds_list_for_each_entry_safe (session, tmp, &session_list->head, list) {
                if (!session_get(session)) {
@@ -1306,11 +1307,10 @@ static void destroy_all_sessions_and_wait()
                session_unlock(session);
                session_put(session);
        }
-       session_unlock_list();
 
        /* Wait for the destruction of all sessions to complete. */
        DBG("Waiting for the destruction of all sessions to complete");
-       session_list_wait_empty();
+       session_list_wait_empty(std::move(list_lock));
        DBG("Destruction of all sessions completed");
 }