X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=6ba6c415b65b74bf2c6571fb6261d6f3f3a34f80;hp=6e507642a224be3affae1540bd762bc2a138849a;hb=ae0a823f9f7e1d3800479488a58efc2f92f27d89;hpb=dd877ea65a8db6b9abcffec9162695059ced90f7

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 6e507642a..6ba6c415b 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2412,6 +2412,8 @@ int handle_notification_thread_command(
 	pthread_mutex_lock(&handle->cmd_queue.lock);
 	cmd = cds_list_first_entry(&handle->cmd_queue.list,
 			struct notification_thread_command, cmd_list_node);
+	cds_list_del(&cmd->cmd_list_node);
+	pthread_mutex_unlock(&handle->cmd_queue.lock);
 	switch (cmd->type) {
 	case NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER:
 		DBG("[notification-thread] Received register trigger command");
@@ -2474,14 +2476,16 @@ int handle_notification_thread_command(
 		goto error_unlock;
 	}
 end:
-	cds_list_del(&cmd->cmd_list_node);
-	lttng_waiter_wake_up(&cmd->reply_waiter);
-	pthread_mutex_unlock(&handle->cmd_queue.lock);
+	if (cmd->is_async) {
+		free(cmd);
+		cmd = NULL;
+	} else {
+		lttng_waiter_wake_up(&cmd->reply_waiter);
+	}
 	return ret;
 error_unlock:
 	/* Wake-up and return a fatal error to the calling thread. */
 	lttng_waiter_wake_up(&cmd->reply_waiter);
-	pthread_mutex_unlock(&handle->cmd_queue.lock);
 	cmd->reply_code = LTTNG_ERR_FATAL;
 error:
 	/* Indicate a fatal error to the caller. */