X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.c;h=a3b41f989e72d5de6e116af5f5730a03f8f05c33;hp=5483a317f60c28bedd8a5ecf96ac87768d9ed52d;hb=0ab399e0bcf4e99492845f02e3e5b405155dea92;hpb=ab0ee2ca29394fa28284b94cc3c598960660404f diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c index 5483a317f..a3b41f989 100644 --- 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 + * Copyright (C) 2017 Jérémie Galarneau * - * 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 @@ -20,7 +10,6 @@ #include "notification-thread.h" #include "notification-thread-commands.h" #include -#include #include #include #include @@ -28,8 +17,8 @@ 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); } static @@ -39,16 +28,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), ¬ification_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,10 +46,66 @@ 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); + 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), + ¬ification_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; } @@ -72,7 +115,7 @@ enum lttng_error_code notification_thread_command_register_trigger( { int ret; enum lttng_error_code ret_code; - struct notification_thread_command cmd; + struct notification_thread_command cmd = {}; init_notification_thread_command(&cmd); @@ -95,7 +138,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); @@ -120,18 +163,18 @@ 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); 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) { @@ -149,7 +192,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); @@ -167,11 +210,69 @@ 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) { int ret; - struct notification_thread_command cmd; + struct notification_thread_command cmd = {}; init_notification_thread_command(&cmd);