X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.cpp;h=fc43684e9b2b2a4035b4837ccae9fcd73f0c0344;hb=64803277bbdbe0a943360d918298a48157d9da55;hp=fbf8ce55c0b1c1d2e25c26688a09c9f0b0270cfd;hpb=21cf9b6b1843774306a76f4dccddddd706b64f79;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.cpp b/src/bin/lttng-sessiond/session.cpp
index fbf8ce55c..fc43684e9 100644
--- a/src/bin/lttng-sessiond/session.cpp
+++ b/src/bin/lttng-sessiond/session.cpp
@@ -17,19 +17,19 @@
 #include <sys/types.h>
 #include <pthread.h>
 
-#include <common/common.h>
-#include <common/utils.h>
-#include <common/trace-chunk.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <lttng/location-internal.h>
-#include "lttng-sessiond.h"
-#include "kernel.h"
-
-#include "session.h"
-#include "utils.h"
-#include "trace-ust.h"
-#include "timer.h"
-#include "cmd.h"
+#include <common/common.hpp>
+#include <common/utils.hpp>
+#include <common/trace-chunk.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <lttng/location-internal.hpp>
+#include "lttng-sessiond.hpp"
+#include "kernel.hpp"
+
+#include "session.hpp"
+#include "utils.hpp"
+#include "trace-ust.hpp"
+#include "timer.hpp"
+#include "cmd.hpp"
 
 struct ltt_session_destroy_notifier_element {
 	ltt_session_destroy_notifier notifier;
@@ -331,12 +331,12 @@ end:
 static void ltt_sessions_ht_destroy(void)
 {
 	if (ltt_sessions_ht_by_id) {
-		ht_cleanup_push(ltt_sessions_ht_by_id);
+		lttng_ht_destroy(ltt_sessions_ht_by_id);
 		ltt_sessions_ht_by_id = NULL;
 	}
 
 	if (ltt_sessions_ht_by_name) {
-		ht_cleanup_push(ltt_sessions_ht_by_name);
+		lttng_ht_destroy(ltt_sessions_ht_by_name);
 		ltt_sessions_ht_by_name = NULL;
 	}
 
@@ -1143,6 +1143,7 @@ struct ltt_session *session_find_by_id(uint64_t id)
 	struct lttng_ht_iter iter;
 	struct ltt_session *ls;
 
+	ASSERT_RCU_READ_LOCKED();
 	ASSERT_LOCKED(ltt_session_list.lock);
 
 	if (!ltt_sessions_ht_by_id) {
@@ -1186,7 +1187,7 @@ enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
 			goto error;
 		}
 	}
-	new_session = (ltt_session *) zmalloc(sizeof(struct ltt_session));
+	new_session = zmalloc<ltt_session>();
 	if (!new_session) {
 		PERROR("Failed to allocate an ltt_session structure");
 		ret_code = LTTNG_ERR_NOMEM;