sessiond: notification: synchronize notification client (and list)

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread-commands.c

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index d9fdf01588465a3e826bbc53b3a0e6cb35d29705..4474d1978ed524f29866248910c6b697cc494282 100644 (file)
--- 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>
@@ -44,9 +34,9 @@ int run_command_wait(struct notification_thread_handle *handle,
        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
@@ -123,13 +113,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) {
@@ -165,6 +155,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)
 {