X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.c;h=a434b08cf47966309dc759d485d5ea23ce805bb3;hp=4474d1978ed524f29866248910c6b697cc494282;hb=fbc9f37df245d544a7705ba576297df791220b44;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index 4474d1978..a434b08cf 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -17,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);
 }
@@ -54,17 +53,75 @@ 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 = {};
 
+	assert(trigger);
 	init_notification_thread_command(&cmd);
 
 	cmd.type = NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER;
+	lttng_trigger_get(trigger);
 	cmd.parameters.trigger = trigger;
 
 	ret = run_command_wait(handle, &cmd);
@@ -83,7 +140,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);
 
@@ -108,7 +165,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);
 
@@ -137,7 +194,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);
 
@@ -162,7 +219,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);
 
@@ -191,7 +248,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);
 
@@ -213,11 +270,41 @@ end:
 	return ret_code;
 }
 
+enum lttng_error_code notification_thread_command_list_triggers(
+		struct notification_thread_handle *handle,
+		uid_t uid,
+		struct lttng_triggers **triggers)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	struct notification_thread_command cmd = {};
+
+	assert(handle);
+	assert(triggers);
+
+	init_notification_thread_command(&cmd);
+
+	cmd.type = NOTIFICATION_COMMAND_TYPE_LIST_TRIGGERS;
+	cmd.parameters.list_triggers.uid = uid;
+
+	ret = run_command_wait(handle, &cmd);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
+		goto end;
+	}
+
+	ret_code = cmd.reply_code;
+	*triggers = cmd.reply.list_triggers.triggers;
+
+end:
+	return ret_code;
+}
+
 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);
 
@@ -225,3 +312,18 @@ void notification_thread_command_quit(
 	ret = run_command_wait(handle, &cmd);
 	assert(!ret && cmd.reply_code == LTTNG_OK);
 }
+
+int notification_thread_client_communication_update(
+		struct notification_thread_handle *handle,
+		notification_client_id id,
+		enum client_transmission_status transmission_status)
+{
+	struct notification_thread_command cmd = {};
+
+	init_notification_thread_command(&cmd);
+
+	cmd.type = NOTIFICATION_COMMAND_TYPE_CLIENT_COMMUNICATION_UPDATE;
+	cmd.parameters.client_communication_update.id = id;
+	cmd.parameters.client_communication_update.status = transmission_status;
+	return run_command_no_wait(handle, &cmd);
+}