X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=88d66317001da76386794acaaef45ed62678b819;hp=1990655ef638368955a52b1f705422cc606db20b;hb=287a512f2b868c16132b894a8143a5faf0379ca8;hpb=da860cab17385f982e501d8a9f8295fe4a24f43d

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 1990655ef..88d663170 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -26,6 +26,8 @@
 #include "ust-registry.h"
 #include "ust-app.h"
 #include "utils.h"
+#include "lttng-sessiond.h"
+#include "notification-thread-commands.h"
 
 /*
  * Hash table match function for event in the registry.
@@ -89,14 +91,23 @@ static int compare_enums(const struct ust_registry_enum *reg_enum_a,
 
 		entries_a = &reg_enum_a->entries[i];
 		entries_b = &reg_enum_b->entries[i];
-		if (entries_a->start != entries_b->start) {
+		if (entries_a->start.value != entries_b->start.value) {
 			ret = -1;
 			goto end;
 		}
-		if (entries_a->end != entries_b->end) {
+		if (entries_a->end.value != entries_b->end.value) {
 			ret = -1;
 			goto end;
 		}
+		if (entries_a->start.signedness != entries_b->start.signedness) {
+			ret = -1;
+			goto end;
+		}
+		if (entries_a->end.signedness != entries_b->end.signedness) {
+			ret = -1;
+			goto end;
+		}
+
 		if (strcmp(entries_a->string, entries_b->string)) {
 			ret = -1;
 			goto end;
@@ -686,13 +697,23 @@ void destroy_channel_rcu(struct rcu_head *head)
  * free the registry pointer since it might not have been allocated before so
  * it's the caller responsability.
  */
-static void destroy_channel(struct ust_registry_channel *chan)
+static void destroy_channel(struct ust_registry_channel *chan, bool notif)
 {
 	struct lttng_ht_iter iter;
 	struct ust_registry_event *event;
+	enum lttng_error_code cmd_ret;
 
 	assert(chan);
 
+	if (notif) {
+		cmd_ret = notification_thread_command_remove_channel(
+				notification_thread_handle, chan->consumer_key,
+				LTTNG_DOMAIN_UST);
+		if (cmd_ret != LTTNG_OK) {
+			ERR("Failed to remove channel from notification thread");
+		}
+	}
+
 	rcu_read_lock();
 	/* Destroy all event associated with this registry. */
 	cds_lfht_for_each_entry(chan->ht->ht, &iter.iter, event, node.node) {
@@ -750,7 +771,7 @@ int ust_registry_channel_add(struct ust_registry_session *session,
 	return 0;
 
 error:
-	destroy_channel(chan);
+	destroy_channel(chan, false);
 error_alloc:
 	return ret;
 }
@@ -789,7 +810,7 @@ end:
  * Remove channel using key from registry and free memory.
  */
 void ust_registry_channel_del_free(struct ust_registry_session *session,
-		uint64_t key)
+		uint64_t key, bool notif)
 {
 	struct lttng_ht_iter iter;
 	struct ust_registry_channel *chan;
@@ -808,7 +829,7 @@ void ust_registry_channel_del_free(struct ust_registry_session *session,
 	ret = lttng_ht_del(session->channels, &iter);
 	assert(!ret);
 	rcu_read_unlock();
-	destroy_channel(chan);
+	destroy_channel(chan, notif);
 
 end:
 	return;
@@ -860,6 +881,8 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 	session->uid = euid;
 	session->gid = egid;
 	session->next_enum_id = 0;
+	session->major = major;
+	session->minor = minor;
 	strncpy(session->root_shm_path, root_shm_path,
 		sizeof(session->root_shm_path));
 	session->root_shm_path[sizeof(session->root_shm_path) - 1] = '\0';
@@ -961,7 +984,7 @@ void ust_registry_session_destroy(struct ust_registry_session *reg)
 			/* Delete the node from the ht and free it. */
 			ret = lttng_ht_del(reg->channels, &iter);
 			assert(!ret);
-			destroy_channel(chan);
+			destroy_channel(chan, true);
 		}
 		rcu_read_unlock();
 		ht_cleanup_push(reg->channels);
@@ -983,7 +1006,7 @@ void ust_registry_session_destroy(struct ust_registry_session *reg)
 		/*
 		 * Try deleting the directory hierarchy.
 		 */
-		(void) run_as_recursive_rmdir(reg->root_shm_path,
+		(void) run_as_rmdir_recursive(reg->root_shm_path,
 				reg->uid, reg->gid);
 	}
 	/* Destroy the enum hash table */