X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=ec4d56bce7d9ec78c6c6926e256e376f59b6297a;hb=9c374932629a1c25927dad13fce02ba1c4892cf7;hp=827cf2c1459f5ee4cb683ac3fd5b0699ab5d9b82;hpb=f712e5f6c7a77e92abed2f0d0740b9512d1fa4e2;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 827cf2c14..ec4d56bce 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2693,6 +2693,9 @@ int handle_notification_thread_command_register_trigger(
 		goto error_free_ht_element;
 	}
 
+	/* From this point consider the trigger registered. */
+	lttng_trigger_set_as_registered(trigger);
+
 	/*
 	 * Some triggers might need a tracer notifier depending on its
 	 * condition and actions.
@@ -2892,6 +2895,11 @@ error_free_ht_element:
 	}
 error:
 	if (free_trigger) {
+		/*
+		 * Other objects might have a reference to the trigger, mark it
+		 * as unregistered.
+		 */
+		lttng_trigger_set_as_unregistered(trigger);
 		lttng_trigger_destroy(trigger);
 	}
 end:
@@ -2973,6 +2981,12 @@ int handle_notification_thread_command_unregister_trigger(
 		cmd_reply = LTTNG_OK;
 	}
 
+	trigger_ht_element = caa_container_of(triggers_ht_node,
+			struct lttng_trigger_ht_element, node);
+
+	/* From this point, consider the trigger unregistered no matter what. */
+	lttng_trigger_set_as_unregistered(trigger_ht_element->trigger);
+
 	/* Remove trigger from channel_triggers_ht. */
 	cds_lfht_for_each_entry(state->channel_triggers_ht, &iter, trigger_list,
 			channel_triggers_ht_node) {
@@ -2995,9 +3009,6 @@ int handle_notification_thread_command_unregister_trigger(
 		teardown_tracer_notifier(state, trigger);
 	}
 
-	trigger_ht_element = caa_container_of(triggers_ht_node,
-			struct lttng_trigger_ht_element, node);
-
 	if (is_trigger_action_notify(trigger)) {
 		/*
 		 * Remove and release the client list from
@@ -4523,13 +4534,6 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 			struct notification_trigger_tokens_ht_element,
 			node);
 
-	if (!lttng_trigger_should_fire(element->trigger)) {
-		ret = 0;
-		goto end_unlock;
-	}
-
-	lttng_trigger_fire(element->trigger);
-
 	trigger_status = lttng_trigger_get_name(element->trigger, &trigger_name);
 	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
@@ -4841,12 +4845,6 @@ int handle_notification_thread_channel_sample(
 			goto put_list;
 		}
 
-		if (!lttng_trigger_should_fire(trigger)) {
-			goto put_list;
-		}
-
-		lttng_trigger_fire(trigger);
-
 		/*
 		 * Ownership of `evaluation` transferred to the action executor
 		 * no matter the result.