X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=72442314becaaeb294fb53696981f9763cdb536b;hb=670a26e4165562ab2dc5a16b9941f942e4f30996;hp=90fdadd61280bc2452063931ad1c7ca1fc837f8b;hpb=5c5373c3cbfebddb0068fe13600766bb381048da;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 90fdadd61..72442314b 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -28,7 +28,7 @@
 #include <lttng/condition/buffer-usage-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>
 #include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/on-event-internal.h>
+#include <lttng/condition/event-rule-matches-internal.h>
 #include <lttng/domain-internal.h>
 #include <lttng/notification/channel-internal.h>
 #include <lttng/trigger/trigger-internal.h>
@@ -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:
@@ -2174,40 +2174,6 @@ end:
 	return ret;
 }
 
-static
-int condition_on_event_update_error_count(struct lttng_trigger *trigger)
-{
-	int ret = 0;
-	uint64_t error_count = 0;
-	struct lttng_condition *condition;
-	enum event_notifier_error_accounting_status status;
-
-	condition = lttng_trigger_get_condition(trigger);
-	assert(lttng_condition_get_type(condition) ==
-			LTTNG_CONDITION_TYPE_ON_EVENT);
-
-	status = event_notifier_error_accounting_get_count(trigger, &error_count);
-	if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
-		uid_t trigger_owner_uid;
-		const char *trigger_name;
-		const enum lttng_trigger_status trigger_status =
-				lttng_trigger_get_owner_uid(
-						trigger, &trigger_owner_uid);
-
-		assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
-		if (lttng_trigger_get_name(trigger, &trigger_name) != LTTNG_TRIGGER_STATUS_OK) {
-			trigger_name = "(unnamed)";
-		}
-
-		ERR("Failed to get event notifier error count of trigger for update: trigger owner = %d, trigger name = '%s'",
-				trigger_owner_uid, trigger_name);
-		ret = -1;
-	}
-
-	lttng_condition_on_event_set_error_count(condition, error_count);
-	return ret;
-}
-
 int handle_notification_thread_remove_tracer_event_source_no_result(
 		struct notification_thread_state *state,
 		int tracer_event_source_fd)
@@ -2255,12 +2221,6 @@ static int handle_notification_thread_command_list_triggers(
 			continue;
 		}
 
-		if (lttng_trigger_needs_tracer_notifier(trigger_ht_element->trigger)) {
-			ret = condition_on_event_update_error_count(
-					trigger_ht_element->trigger);
-			assert(!ret);
-		}
-
 		ret = lttng_triggers_add(local_triggers,
 				trigger_ht_element->trigger);
 		if (ret < 0) {
@@ -2917,8 +2877,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:
@@ -4638,7 +4598,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:
@@ -4921,9 +4881,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: