X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.h;h=11889f934f120f2e056a03cce29f3e224179d180;hp=fc7e90bcb95ecf319c89e6bd8979602eddaac0ef;hb=0ab399e0bcf4e99492845f02e3e5b405155dea92;hpb=ab0ee2ca29394fa28284b94cc3c598960660404f

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.h
index fc7e90bcb..11889f934 100644
--- a/src/bin/lttng-sessiond/notification-thread-commands.h
+++ b/src/bin/lttng-sessiond/notification-thread-commands.h
@@ -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.
  */
 
 #ifndef NOTIFICATION_THREAD_COMMANDS_H
@@ -22,6 +12,10 @@
 #include <lttng/lttng-error.h>
 #include <urcu/rculfhash.h>
 #include "notification-thread.h"
+#include "notification-thread-internal.h"
+#include "notification-thread-events.h"
+#include <common/waiter.h>
+#include <stdbool.h>
 
 struct notification_thread_data;
 struct lttng_trigger;
@@ -31,24 +25,11 @@ enum notification_thread_command_type {
 	NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER,
 	NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL,
 	NOTIFICATION_COMMAND_TYPE_REMOVE_CHANNEL,
+	NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_ONGOING,
+	NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_COMPLETED,
 	NOTIFICATION_COMMAND_TYPE_QUIT,
 };
 
-struct channel_key {
-	uint64_t key;
-	enum lttng_domain_type domain;
-};
-
-struct channel_info {
-	struct channel_key key;
-	char *session_name;
-	uid_t uid;
-	gid_t gid;
-	char *channel_name;
-	uint64_t capacity;
-	struct cds_lfht_node channels_ht_node;
-};
-
 struct notification_thread_command {
 	struct cds_list_head cmd_list_node;
 
@@ -57,17 +38,37 @@ struct notification_thread_command {
 		/* Register/Unregister trigger. */
 		struct lttng_trigger *trigger;
 		/* Add channel. */
-		struct channel_info add_channel;
+		struct {
+			struct {
+				const char *name;
+				uid_t uid;
+				gid_t gid;
+			} session;
+			struct {
+				const char *name;
+				enum lttng_domain_type domain;
+				uint64_t key;
+				uint64_t capacity;
+			} channel;
+		} add_channel;
 		/* Remove channel. */
 		struct {
 			uint64_t key;
 			enum lttng_domain_type domain;
 		} remove_channel;
+		struct {
+			const char *session_name;
+			uid_t uid;
+			gid_t gid;
+			uint64_t trace_archive_chunk_id;
+			struct lttng_trace_archive_location *location;
+		} session_rotation;
 	} parameters;
 
-	/* Futex on which to wait for command reply (optional). */
-	int32_t reply_futex;
+	/* lttng_waiter on which to wait for command reply (optional). */
+	struct lttng_waiter reply_waiter;
 	enum lttng_error_code reply_code;
+	bool is_async;
 };
 
 enum lttng_error_code notification_thread_command_register_trigger(
@@ -80,7 +81,7 @@ enum lttng_error_code notification_thread_command_unregister_trigger(
 
 enum lttng_error_code notification_thread_command_add_channel(
 		struct notification_thread_handle *handle,
-		char *session_name, uid_t uid, gid_t gid,
+		char *session_name, uid_t session_uid, gid_t session_gid,
 		char *channel_name, uint64_t key,
 		enum lttng_domain_type domain, uint64_t capacity);
 
@@ -88,6 +89,18 @@ enum lttng_error_code notification_thread_command_remove_channel(
 		struct notification_thread_handle *handle,
 		uint64_t key, enum lttng_domain_type domain);
 
+enum lttng_error_code notification_thread_command_session_rotation_ongoing(
+		struct notification_thread_handle *handle,
+		const char *session_name, uid_t session_uid, gid_t session_gid,
+		uint64_t trace_archive_chunk_id);
+
+/* Ownership of location is transferred. */
+enum lttng_error_code notification_thread_command_session_rotation_completed(
+		struct notification_thread_handle *handle,
+		const char *session_name, uid_t session_uid, gid_t session_gid,
+		uint64_t trace_archive_chunk_id,
+		struct lttng_trace_archive_location *location);
+
 void notification_thread_command_quit(
 		struct notification_thread_handle *handle);