X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.cpp;h=effb319994e98a89cabf01f2ad97bad9e37fe8c3;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=baa58d73195c4fa3e1f3ab24d7cb730e41349614;hpb=3c3390532736cfb5198f863d0d2b218e21fcf76d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-registry.cpp b/src/bin/lttng-sessiond/ust-registry.cpp
index baa58d731..effb31999 100644
--- a/src/bin/lttng-sessiond/ust-registry.cpp
+++ b/src/bin/lttng-sessiond/ust-registry.cpp
@@ -8,16 +8,16 @@
 #define _LGPL_SOURCE
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/hashtable/utils.h>
+#include <common/common.hpp>
+#include <common/hashtable/utils.hpp>
 #include <lttng/lttng.h>
 
-#include "ust-registry.h"
-#include "ust-app.h"
-#include "ust-field-utils.h"
-#include "utils.h"
-#include "lttng-sessiond.h"
-#include "notification-thread-commands.h"
+#include "ust-registry.hpp"
+#include "ust-app.hpp"
+#include "ust-field-utils.hpp"
+#include "utils.hpp"
+#include "lttng-sessiond.hpp"
+#include "notification-thread-commands.hpp"
 
 /*
  * Hash table match function for event in the registry.
@@ -315,7 +315,7 @@ error:
 
 /*
  * Free event data structure. This does NOT delete it from any hash table. It's
- * safe to pass a NULL pointer. This shoudl be called inside a call RCU if the
+ * safe to pass a NULL pointer. This should be called inside a call RCU if the
  * event is previously deleted from a rcu hash table.
  */
 static void destroy_event(struct ust_registry_event *event)
@@ -361,6 +361,7 @@ struct ust_registry_event *ust_registry_find_event(
 	LTTNG_ASSERT(chan);
 	LTTNG_ASSERT(name);
 	LTTNG_ASSERT(sig);
+	ASSERT_RCU_READ_LOCKED();
 
 	/* Setup key for the match function. */
 	strncpy(key.name, name, sizeof(key.name));
@@ -509,6 +510,7 @@ void ust_registry_destroy_event(struct ust_registry_channel *chan,
 
 	LTTNG_ASSERT(chan);
 	LTTNG_ASSERT(event);
+	ASSERT_RCU_READ_LOCKED();
 
 	/* Delete the node first. */
 	iter.iter.node = &event->node.node;
@@ -549,6 +551,8 @@ static struct ust_registry_enum *ust_registry_lookup_enum(
 	struct lttng_ht_node_str *node;
 	struct lttng_ht_iter iter;
 
+	ASSERT_RCU_READ_LOCKED();
+
 	cds_lfht_lookup(session->enums->ht,
 			ht_hash_enum((void *) reg_enum_lookup, lttng_ht_seed),
 			ht_match_enum, reg_enum_lookup, &iter.iter);
@@ -574,6 +578,8 @@ struct ust_registry_enum *
 	struct lttng_ht_iter iter;
 	struct ust_registry_enum reg_enum_lookup;
 
+	ASSERT_RCU_READ_LOCKED();
+
 	memset(&reg_enum_lookup, 0, sizeof(reg_enum_lookup));
 	strncpy(reg_enum_lookup.name, enum_name, LTTNG_UST_ABI_SYM_NAME_LEN);
 	reg_enum_lookup.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0';
@@ -681,6 +687,7 @@ static void ust_registry_destroy_enum(struct ust_registry_session *reg_session,
 
 	LTTNG_ASSERT(reg_session);
 	LTTNG_ASSERT(reg_enum);
+	ASSERT_RCU_READ_LOCKED();
 
 	/* Delete the node first. */
 	iter.iter.node = &reg_enum->node.node;
@@ -805,6 +812,7 @@ struct ust_registry_channel *ust_registry_channel_find(
 
 	LTTNG_ASSERT(session);
 	LTTNG_ASSERT(session->channels);
+	ASSERT_RCU_READ_LOCKED();
 
 	DBG3("UST registry channel finding key %" PRIu64, key);