X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-commands.h;h=50751a94d1ed4dc3c6cf6f2a4c68e55d6d4abf12;hp=fc7e90bcb95ecf319c89e6bd8979602eddaac0ef;hb=ac16173e318279dee29504820e3c2ad8ea597712;hpb=ab0ee2ca29394fa28284b94cc3c598960660404f diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.h index fc7e90bcb..50751a94d 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 + * 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. */ #ifndef NOTIFICATION_THREAD_COMMANDS_H @@ -22,6 +12,10 @@ #include #include #include "notification-thread.h" +#include "notification-thread-internal.h" +#include "notification-thread-events.h" +#include +#include struct notification_thread_data; struct lttng_trigger; @@ -31,22 +25,13 @@ 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_ADD_TRACER_EVENT_SOURCE, + NOTIFICATION_COMMAND_TYPE_REMOVE_TRACER_EVENT_SOURCE, + NOTIFICATION_COMMAND_TYPE_LIST_TRIGGERS, 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; + NOTIFICATION_COMMAND_TYPE_CLIENT_COMMUNICATION_UPDATE, }; struct notification_thread_command { @@ -54,20 +39,67 @@ struct notification_thread_command { enum notification_thread_command_type type; union { - /* Register/Unregister trigger. */ - struct lttng_trigger *trigger; + /* Register trigger. */ + struct { + struct lttng_trigger *trigger; + } register_trigger; + /* Unregister trigger. */ + struct { + const struct lttng_trigger *trigger; + } unregister_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; + /* Add/Remove tracer event source fd. */ + struct { + int tracer_event_source_fd; + enum lttng_domain_type domain; + } tracer_event_source; + /* List triggers. */ + struct { + /* Credentials of the requesting user. */ + uid_t uid; + } list_triggers; + /* Client communication update. */ + struct { + notification_client_id id; + enum client_transmission_status status; + } client_communication_update; + } parameters; - /* Futex on which to wait for command reply (optional). */ - int32_t reply_futex; + union { + struct { + struct lttng_triggers *triggers; + } list_triggers; + } reply; + /* 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( @@ -76,11 +108,11 @@ enum lttng_error_code notification_thread_command_register_trigger( enum lttng_error_code notification_thread_command_unregister_trigger( struct notification_thread_handle *handle, - struct lttng_trigger *trigger); + const struct lttng_trigger *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 +120,49 @@ 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); + +/* + * Return the set of triggers visible to a given client. + * + * The trigger objects contained in the set are the actual trigger instances + * used by the notification subsystem (i.e. not a copy). Given that the command + * is only used to serialize the triggers, this is fine: the properties that + * are serialized are immutable over the lifetime of the triggers. + * + * Moreover, the lifetime of the trigger instances is protected through + * reference counting (references are held by the trigger set). + * + * The caller has the exclusive ownership of the returned trigger set. + */ +enum lttng_error_code notification_thread_command_list_triggers( + struct notification_thread_handle *handle, + uid_t client_uid, + struct lttng_triggers **triggers); + +/* + * The ownership of trigger_event_application_pipe is _not_ transferred to + * the notification thread. + */ +enum lttng_error_code notification_thread_command_add_tracer_event_source( + struct notification_thread_handle *handle, + int tracer_event_source_fd, + enum lttng_domain_type domain); + +enum lttng_error_code notification_thread_command_remove_tracer_event_source( + struct notification_thread_handle *handle, + int tracer_event_source_fd); + void notification_thread_command_quit( struct notification_thread_handle *handle);