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=c142e849b3e234703b9dc6102f37f4a01e904ee9;hb=58d3fed5a62a82ce8487dce41a3092e79a9bca15;hpb=8abe313a6c4f251063e4b72ddd47ce8107384d71 diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c index c142e849b..129cf4ee2 100644 --- a/src/bin/lttng-sessiond/notification-thread-commands.c +++ b/src/bin/lttng-sessiond/notification-thread-commands.c @@ -44,9 +44,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(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe), + 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 @@ -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) {