X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.c;h=8f8bae406c8994db1577f8ce455bb71163784cb6;hb=7c920b632d63ffd82074430d77862176e0fc477c;hp=5459c4b5e4876ef75f45f65e6c6c7344eef020e6;hpb=c203f0585aa3a3b1c2b1994899b8277ed79dad2d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index 5459c4b5e..8f8bae406 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -22,6 +22,7 @@
 #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/lttng-error.h>
 #include <lttng/trigger/trigger-internal.h>
 #include <pthread.h>
@@ -424,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;
 	}
 
@@ -500,7 +501,7 @@ static int action_executor_generic_handler(struct action_executor *executor,
 
 	assert(action_type != LTTNG_ACTION_TYPE_UNKNOWN);
 
-	DBG("Executing action `%s` of trigger `%p` action work item %" PRIu64,
+	DBG("Executing action `%s` of trigger `%s` action work item %" PRIu64,
 			get_action_name(action),
 			get_trigger_name(work_item->trigger),
 			work_item->id);
@@ -600,8 +601,10 @@ static bool shutdown_action_executor_thread(void *_data)
 {
 	struct action_executor *executor = _data;
 
+	pthread_mutex_lock(&executor->work.lock);
 	executor->should_quit = true;
 	pthread_cond_signal(&executor->work.cond);
+	pthread_mutex_unlock(&executor->work.lock);
 	return true;
 }
 
@@ -689,7 +692,7 @@ enum action_executor_status action_executor_enqueue(
 
 	work_item = zmalloc(sizeof(*work_item));
 	if (!work_item) {
-		PERROR("Failed to allocate action executor work item on behalf of trigger `%p`",
+		PERROR("Failed to allocate action executor work item on behalf of trigger `%s`",
 				get_trigger_name(trigger));
 		executor_status = ACTION_EXECUTOR_STATUS_ERROR;
 		goto error_unlock;
@@ -720,15 +723,15 @@ enum action_executor_status action_executor_enqueue(
 	evaluation = NULL;
 	cds_list_add_tail(&work_item->list_node, &executor->work.list);
 	executor->work.pending_count++;
-	DBG("Enqueued action for trigger `%p` as work item %" PRIu64,
+	DBG("Enqueued action for trigger `%s` as work item #%" PRIu64,
 			get_trigger_name(trigger), work_item_id);
 	signal = true;
 
 error_unlock:
-	pthread_mutex_unlock(&executor->work.lock);
 	if (signal) {
 		pthread_cond_signal(&executor->work.cond);
 	}
+	pthread_mutex_unlock(&executor->work.lock);
 
 	lttng_evaluation_destroy(evaluation);
 	return executor_status;