Add session rotation ongoing/completed notification commands

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index c142e849b3e234703b9dc6102f37f4a01e904ee9..11275ffc0e89f22c1f7cae596e2b8dbb30d880de 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -165,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)
 {

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.h
index 5c6441542ac091a742197b337807429386ecf4cf..b8cb2779ffc97ec6f51d32cd80dbc3102feb262f 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.h
+++ b/src/bin/lttng-sessiond/notification-thread-commands.h
@@ -34,6 +34,8 @@ 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,
 };
 
@@ -63,6 +65,13 @@ struct notification_thread_command {
                        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;
 
        /* lttng_waiter on which to wait for command reply (optional). */
@@ -80,7 +89,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 +97,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);