X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.cpp;fp=src%2Fbin%2Flttng-sessiond%2Fcontext.cpp;h=79c454809cdb3f65f97da0526130c635e16207a2;hp=b3b549187ecd57fcf5f7d989de230bc00ae6abbf;hb=56047f5a23df5c2c583a102b8015bbec5a7da9f1;hpb=66cefebdc240cbae0bc79594305f509b0779fa98

diff --git a/src/bin/lttng-sessiond/context.cpp b/src/bin/lttng-sessiond/context.cpp
index b3b549187..79c454809 100644
--- a/src/bin/lttng-sessiond/context.cpp
+++ b/src/bin/lttng-sessiond/context.cpp
@@ -15,6 +15,7 @@
 
 #include <common/error.hpp>
 #include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/urcu.hpp>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -374,7 +375,7 @@ int context_ust_add(struct ltt_ust_session *usess,
 	LTTNG_ASSERT(ctx);
 	LTTNG_ASSERT(channel_name);
 
-	rcu_read_lock();
+	lttng::urcu::read_lock_guard read_lock;
 
 	chan_ht = usess->domain_global.channels;
 
@@ -391,7 +392,6 @@ int context_ust_add(struct ltt_ust_session *usess,
 		/* Add ctx to channel */
 		ret = add_uctx_to_channel(usess, domain, uchan, ctx);
 	} else {
-		rcu_read_lock();
 		/* Add ctx all events, all channels */
 		cds_lfht_for_each_entry (chan_ht->ht, &iter.iter, uchan, node.node) {
 			ret = add_uctx_to_channel(usess, domain, uchan, ctx);
@@ -400,7 +400,6 @@ int context_ust_add(struct ltt_ust_session *usess,
 				continue;
 			}
 		}
-		rcu_read_unlock();
 	}
 
 	switch (ret) {
@@ -426,6 +425,5 @@ int context_ust_add(struct ltt_ust_session *usess,
 	}
 
 error:
-	rcu_read_unlock();
 	return ret;
 }