X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=5cccc008efbc409fb3797590aaae22bcf6c1c823;hb=72365501d3148ca977a09bad8de0ec51b427bdd8;hp=28e553f44875c59c74f28fc29d1dbd9adf102e54;hpb=8790759cef081ff562cff2b493e20a6a085f4b21;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 28e553f44..5cccc008e 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -1953,9 +1953,9 @@ int handle_notification_thread_command_session_rotation(
 		 * Ownership of `evaluation` transferred to the action executor
 		 * no matter the result.
 		 */
-		executor_status = action_executor_enqueue(state->executor,
-				trigger, evaluation, &session_creds,
-				client_list);
+		executor_status = action_executor_enqueue_trigger(
+				state->executor, trigger, evaluation,
+				&session_creds, client_list);
 		evaluation = NULL;
 		switch (executor_status) {
 		case ACTION_EXECUTOR_STATUS_OK:
@@ -2917,8 +2917,8 @@ int handle_notification_thread_command_register_trigger(
 	 * Ownership of `evaluation` transferred to the action executor
 	 * no matter the result.
 	 */
-	executor_status = action_executor_enqueue(state->executor, trigger,
-			evaluation, &object_creds, client_list);
+	executor_status = action_executor_enqueue_trigger(state->executor,
+			trigger, evaluation, &object_creds, client_list);
 	evaluation = NULL;
 	switch (executor_status) {
 	case ACTION_EXECUTOR_STATUS_OK:
@@ -3049,9 +3049,6 @@ int handle_notification_thread_command_unregister_trigger(
 	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) {
@@ -4641,7 +4638,7 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 	}
 	client_list = get_client_list_from_condition(state,
 			lttng_trigger_get_const_condition(element->trigger));
-	executor_status = action_executor_enqueue(state->executor,
+	executor_status = action_executor_enqueue_trigger(state->executor,
 			element->trigger, evaluation, NULL, client_list);
 	switch (executor_status) {
 	case ACTION_EXECUTOR_STATUS_OK:
@@ -4924,9 +4921,9 @@ int handle_notification_thread_channel_sample(
 		 * Ownership of `evaluation` transferred to the action executor
 		 * no matter the result.
 		 */
-		executor_status = action_executor_enqueue(state->executor,
-				trigger, evaluation, &channel_creds,
-				client_list);
+		executor_status = action_executor_enqueue_trigger(
+				state->executor, trigger, evaluation,
+				&channel_creds, client_list);
 		evaluation = NULL;
 		switch (executor_status) {
 		case ACTION_EXECUTOR_STATUS_OK: