X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.c;h=a3b41f989e72d5de6e116af5f5730a03f8f05c33;hp=129cf4ee2def83df575cf6d170d327dc6544dc5a;hb=0ab399e0bcf4e99492845f02e3e5b405155dea92;hpb=58d3fed5a62a82ce8487dce41a3092e79a9bca15

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index 129cf4ee2..a3b41f989 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <lttng/trigger/trigger.h>
@@ -27,7 +17,6 @@
 static
 void init_notification_thread_command(struct notification_thread_command *cmd)
 {
-	memset(cmd, 0, sizeof(*cmd));
 	CDS_INIT_LIST_HEAD(&cmd->cmd_list_node);
 	lttng_waiter_init(&cmd->reply_waiter);
 }
@@ -64,13 +53,69 @@ error_unlock_queue:
 	return -1;
 }
 
+static
+struct notification_thread_command *notification_thread_command_copy(
+	const struct notification_thread_command *original_cmd)
+{
+	struct notification_thread_command *new_cmd;
+
+	new_cmd = zmalloc(sizeof(*new_cmd));
+	if (!new_cmd) {
+		goto end;
+	}
+
+	*new_cmd = *original_cmd;
+	init_notification_thread_command(new_cmd);
+end:
+	return new_cmd;
+}
+
+static
+int run_command_no_wait(struct notification_thread_handle *handle,
+		const struct notification_thread_command *in_cmd)
+{
+	int ret;
+	uint64_t notification_counter = 1;
+	struct notification_thread_command *new_cmd =
+			notification_thread_command_copy(in_cmd);
+
+	if (!new_cmd) {
+		goto error;
+	}
+	new_cmd->is_async = true;
+
+	pthread_mutex_lock(&handle->cmd_queue.lock);
+	/* Add to queue. */
+	cds_list_add_tail(&new_cmd->cmd_list_node,
+			&handle->cmd_queue.list);
+	/* Wake-up thread. */
+	ret = lttng_write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
+			&notification_counter, sizeof(notification_counter));
+	if (ret != sizeof(notification_counter)) {
+		PERROR("write to notification thread's queue event fd");
+		/*
+		 * Remove the command from the list so the notification
+		 * thread does not process it.
+		 */
+		cds_list_del(&new_cmd->cmd_list_node);
+		goto error_unlock_queue;
+	}
+	pthread_mutex_unlock(&handle->cmd_queue.lock);
+	return 0;
+error_unlock_queue:
+	free(new_cmd);
+	pthread_mutex_unlock(&handle->cmd_queue.lock);
+error:
+	return -1;
+}
+
 enum lttng_error_code notification_thread_command_register_trigger(
 		struct notification_thread_handle *handle,
 		struct lttng_trigger *trigger)
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);
 
@@ -93,7 +138,7 @@ enum lttng_error_code notification_thread_command_unregister_trigger(
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);
 
@@ -118,7 +163,7 @@ enum lttng_error_code notification_thread_command_add_channel(
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);
 
@@ -147,7 +192,7 @@ enum lttng_error_code notification_thread_command_remove_channel(
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);
 
@@ -172,7 +217,7 @@ enum lttng_error_code notification_thread_command_session_rotation_ongoing(
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);
 
@@ -201,7 +246,7 @@ enum lttng_error_code notification_thread_command_session_rotation_completed(
 {
 	int ret;
 	enum lttng_error_code ret_code;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);
 
@@ -227,7 +272,7 @@ void notification_thread_command_quit(
 		struct notification_thread_handle *handle)
 {
 	int ret;
-	struct notification_thread_command cmd;
+	struct notification_thread_command cmd = {};
 
 	init_notification_thread_command(&cmd);