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

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index 5483a317f..129cf4ee2 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -20,7 +20,6 @@
 #include "notification-thread.h"
 #include "notification-thread-commands.h"
 #include <common/error.h>
-#include <common/futex.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <inttypes.h>
@@ -30,6 +29,7 @@ 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);
 }
 
 static
@@ -39,16 +39,14 @@ int run_command_wait(struct notification_thread_handle *handle,
 	int ret;
 	uint64_t notification_counter = 1;
 
-	futex_nto1_prepare(&cmd->reply_futex);
-
 	pthread_mutex_lock(&handle->cmd_queue.lock);
 	/* Add to queue. */
 	cds_list_add_tail(&cmd->cmd_list_node,
 			&handle->cmd_queue.list);
 	/* Wake-up thread. */
-	ret = write(handle->cmd_queue.event_fd,
+	ret = lttng_write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
 			&notification_counter, sizeof(notification_counter));
-	if (ret < 0) {
+	if (ret != sizeof(notification_counter)) {
 		PERROR("write to notification thread's queue event fd");
 		/*
 		 * Remove the command from the list so the notification
@@ -59,7 +57,7 @@ int run_command_wait(struct notification_thread_handle *handle,
 	}
 	pthread_mutex_unlock(&handle->cmd_queue.lock);
 
-	futex_nto1_wait(&cmd->reply_futex);
+	lttng_waiter_wait(&cmd->reply_waiter);
 	return 0;
 error_unlock_queue:
 	pthread_mutex_unlock(&handle->cmd_queue.lock);
@@ -125,13 +123,13 @@ enum lttng_error_code notification_thread_command_add_channel(
 	init_notification_thread_command(&cmd);
 
 	cmd.type = NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL;
-	cmd.parameters.add_channel.session_name = session_name;
-	cmd.parameters.add_channel.uid = uid;
-	cmd.parameters.add_channel.gid = gid;
-	cmd.parameters.add_channel.channel_name = channel_name;
-	cmd.parameters.add_channel.key.key = key;
-	cmd.parameters.add_channel.key.domain = domain;
-	cmd.parameters.add_channel.capacity = capacity;
+	cmd.parameters.add_channel.session.name = session_name;
+	cmd.parameters.add_channel.session.uid = uid;
+	cmd.parameters.add_channel.session.gid = gid;
+	cmd.parameters.add_channel.channel.name = channel_name;
+	cmd.parameters.add_channel.channel.key = key;
+	cmd.parameters.add_channel.channel.domain = domain;
+	cmd.parameters.add_channel.channel.capacity = capacity;
 
 	ret = run_command_wait(handle, &cmd);
 	if (ret) {
@@ -167,6 +165,64 @@ end:
 	return ret_code;
 }
 
+enum lttng_error_code notification_thread_command_session_rotation_ongoing(
+		struct notification_thread_handle *handle,
+		const char *session_name, uid_t uid, gid_t gid,
+		uint64_t trace_archive_chunk_id)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	struct notification_thread_command cmd;
+
+	init_notification_thread_command(&cmd);
+
+	cmd.type = NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_ONGOING;
+	cmd.parameters.session_rotation.session_name = session_name;
+	cmd.parameters.session_rotation.uid = uid;
+	cmd.parameters.session_rotation.gid = gid;
+	cmd.parameters.session_rotation.trace_archive_chunk_id =
+			trace_archive_chunk_id;
+
+	ret = run_command_wait(handle, &cmd);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
+		goto end;
+	}
+	ret_code = cmd.reply_code;
+end:
+	return ret_code;
+}
+
+enum lttng_error_code notification_thread_command_session_rotation_completed(
+		struct notification_thread_handle *handle,
+		const char *session_name, uid_t uid, gid_t gid,
+		uint64_t trace_archive_chunk_id,
+		struct lttng_trace_archive_location *location)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+	struct notification_thread_command cmd;
+
+	init_notification_thread_command(&cmd);
+
+	cmd.type = NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_COMPLETED;
+	cmd.parameters.session_rotation.session_name = session_name;
+	cmd.parameters.session_rotation.uid = uid;
+	cmd.parameters.session_rotation.gid = gid;
+	cmd.parameters.session_rotation.trace_archive_chunk_id =
+			trace_archive_chunk_id;
+	cmd.parameters.session_rotation.location = location;
+
+	ret = run_command_wait(handle, &cmd);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
+		goto end;
+	}
+	ret_code = cmd.reply_code;
+end:
+	return ret_code;
+}
+
 void notification_thread_command_quit(
 		struct notification_thread_handle *handle)
 {