X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.c;h=2a0aab45c962db46f9e9f499a7bdaca3420bd98a;hp=27f0e472305b6a7a3eb5cafbb50fe8057d0392b5;hb=8db3acaf0eb2b0032c2ba25b038d37d166933fa6;hpb=d0e263e7e628d2eba76c883ffc6fb92065e440c7

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index 27f0e4723..2a0aab45c 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -601,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;
 }
 
@@ -726,10 +728,10 @@ enum action_executor_status action_executor_enqueue(
 	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;