X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.c;h=fc7d03d70a9fa4a3701ec5cce53ff98422df0a76;hp=e3b387d62d35c33e76c95f2b3745bdfde1e74156;hb=17182cfd13b6d35cf8c80d4f9ccf8d2bdd1a05f2;hpb=6c24d3fd5ade8231445e720c174afe3da4210179

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index e3b387d62..fc7d03d70 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -104,7 +104,7 @@ static const char *action_type_names[] = {
 
 static const char *get_action_name(const struct lttng_action *action)
 {
-	return action_type_names[lttng_action_get_type_const(action)];
+	return action_type_names[lttng_action_get_type(action)];
 }
 
 /* Check if this trigger allowed to interect with a given session. */
@@ -486,7 +486,7 @@ static int action_executor_generic_handler(struct action_executor *executor,
 			work_item->trigger,
 			work_item->id);
 
-	return action_executors[lttng_action_get_type_const(action)](
+	return action_executors[lttng_action_get_type(action)](
 			executor, work_item, action);
 }
 
@@ -563,7 +563,9 @@ static void *action_executor_thread(void *_data)
 		pthread_mutex_lock(&executor->work.lock);
 	}
 
-	pthread_mutex_unlock(&executor->work.lock);
+	if (executor->should_quit) {
+		pthread_mutex_unlock(&executor->work.lock);
+	}
 	DBG("Left work execution loop");
 
 	health_code_update();