X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=052689a0ebd8439dbf11db0172df7eb520c68605;hp=3482a7e89509b697743fd62d57baa7c7bbc26c90;hb=763de384811082b26bafbce1c65d38032ef6ed30;hpb=b248644d2a0ca1c58b090a362184c7765f0297a4

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 3482a7e89..052689a0e 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -1931,6 +1931,7 @@ int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
 			channels_ht_node) {
 		struct lttng_trigger_list_element *trigger_list_element;
 		struct lttng_channel_trigger_list *trigger_list;
+		struct cds_lfht_iter lookup_iter;
 
 		if (!trigger_applies_to_channel(trigger, channel)) {
 			continue;
@@ -1940,8 +1941,8 @@ int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
 				hash_channel_key(&channel->key),
 				match_channel_trigger_list,
 				&channel->key,
-				&iter);
-		node = cds_lfht_iter_get_node(&iter);
+				&lookup_iter);
+		node = cds_lfht_iter_get_node(&lookup_iter);
 		assert(node);
 		trigger_list = caa_container_of(node,
 				struct lttng_channel_trigger_list,
@@ -2277,9 +2278,9 @@ int handle_notification_thread_command(
 	struct notification_thread_command *cmd;
 
 	/* Read the event pipe to put it back into a quiescent state. */
-	ret = read(lttng_pipe_get_readfd(handle->cmd_queue.event_pipe), &counter,
+	ret = lttng_read(lttng_pipe_get_readfd(handle->cmd_queue.event_pipe), &counter,
 			sizeof(counter));
-	if (ret == -1) {
+	if (ret != sizeof(counter)) {
 		goto error;
 	}
 
@@ -2543,6 +2544,7 @@ int handle_notification_thread_trigger_unregister_all(
 	struct cds_lfht_iter iter;
 	struct lttng_trigger_ht_element *trigger_ht_element;
 
+	rcu_read_lock();
 	cds_lfht_for_each_entry(state->triggers_ht, &iter, trigger_ht_element,
 			node) {
 		int ret = handle_notification_thread_command_unregister_trigger(
@@ -2551,6 +2553,7 @@ int handle_notification_thread_trigger_unregister_all(
 			error_occurred = true;
 		}
 	}
+	rcu_read_unlock();
 	return error_occurred ? -1 : 0;
 }