X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.c;h=e5e72b09f2bd88b789d3993212e6b95c1cdeea44;hb=13bdb81c99ef4350c0cb1eb88e95cf73fb4b56e4;hp=418a6de75f6e23edf28dd668aa75b1240a89d54e;hpb=2516f2d887c20c21cc17ff4cd3b07b3d9ed02244;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index 418a6de75..e5e72b09f 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -16,13 +16,14 @@
 #include <common/optional.h>
 #include <lttng/action/action-internal.h>
 #include <lttng/action/group.h>
+#include <lttng/action/notify-internal.h>
 #include <lttng/action/notify.h>
 #include <lttng/action/rotate-session.h>
 #include <lttng/action/snapshot-session.h>
 #include <lttng/action/start-session.h>
 #include <lttng/action/stop-session.h>
 #include <lttng/condition/evaluation.h>
-#include <lttng/condition/event-rule-internal.h>
+#include <lttng/condition/on-event-internal.h>
 #include <lttng/lttng-error.h>
 #include <lttng/trigger/trigger-internal.h>
 #include <pthread.h>
@@ -196,9 +197,8 @@ static int action_executor_notify_handler(struct action_executor *executor,
 		const struct lttng_action *action)
 {
 	return notification_client_list_send_evaluation(work_item->client_list,
-			lttng_trigger_get_const_condition(work_item->trigger),
+			work_item->trigger,
 			work_item->evaluation,
-			lttng_trigger_get_credentials(work_item->trigger),
 			work_item->object_creds.is_set ?
 					&(work_item->object_creds.value) :
 					NULL,
@@ -425,9 +425,9 @@ static int action_executor_snapshot_session_handler(struct action_executor *exec
 	session_lock_list();
 	session = session_find_by_name(session_name);
 	if (!session) {
-		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%p`",
+		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
 				session_name, get_action_name(action),
-		    work_item->trigger);
+				get_trigger_name(work_item->trigger));
 		goto error_unlock_list;
 	}
 
@@ -539,7 +539,8 @@ static void *action_executor_thread(void *_data)
 
 	assert(executor);
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ACTION_EXECUTOR);
+	health_register(the_health_sessiond,
+			HEALTH_SESSIOND_TYPE_ACTION_EXECUTOR);
 
 	rcu_register_thread();
 	rcu_thread_online();
@@ -592,7 +593,7 @@ static void *action_executor_thread(void *_data)
 
 	rcu_thread_offline();
 	rcu_unregister_thread();
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 
 	return NULL;
 }