Fix: sessiond: rotation thread: fatal error when not finding a session

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

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.h b/src/bin/lttng-sessiond/notification-thread-commands.h
index 3f883bf20fbda7129eedac4d16516a8c3c2f8d2b..643b0e6020913432b47e763790cbf3421080e2cc 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.h
+++ b/src/bin/lttng-sessiond/notification-thread-commands.h
@@ -27,9 +27,12 @@ enum notification_thread_command_type {
        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,
        NOTIFICATION_COMMAND_TYPE_CLIENT_COMMUNICATION_UPDATE,
+       NOTIFICATION_COMMAND_TYPE_GET_TRIGGER,
 };
 
 struct notification_thread_command {
@@ -37,8 +40,15 @@ 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;
+                       bool is_trigger_anonymous;
+               } register_trigger;
+               /* Unregister trigger. */
+               struct {
+                       const struct lttng_trigger *trigger;
+               } unregister_trigger;
                /* Add channel. */
                struct {
                        struct {
@@ -63,8 +73,14 @@ struct notification_thread_command {
                        uid_t uid;
                        gid_t gid;
                        uint64_t trace_archive_chunk_id;
+                       /* Weak reference. */
                        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. */
@@ -76,12 +92,19 @@ struct notification_thread_command {
                        enum client_transmission_status status;
                } client_communication_update;
 
+               struct {
+                       const struct lttng_trigger *trigger;
+               } get_trigger;
+
        } parameters;
 
        union {
                struct {
                        struct lttng_triggers *triggers;
                } list_triggers;
+               struct {
+                       struct lttng_trigger *trigger;
+               } get_trigger;
        } reply;
        /* lttng_waiter on which to wait for command reply (optional). */
        struct lttng_waiter reply_waiter;
@@ -91,11 +114,12 @@ struct notification_thread_command {
 
 enum lttng_error_code notification_thread_command_register_trigger(
                struct notification_thread_handle *handle,
-               struct lttng_trigger *trigger);
+               struct lttng_trigger *trigger,
+               bool is_anonymous_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,
@@ -137,7 +161,25 @@ enum lttng_error_code notification_thread_command_list_triggers(
                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);
 
+enum lttng_error_code notification_thread_command_get_trigger(
+               struct notification_thread_handle *handle,
+               const struct lttng_trigger *trigger,
+               struct lttng_trigger **real_trigger);
+
 #endif /* NOTIFICATION_THREAD_COMMANDS_H */