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

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.h

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index 89a4ab19f03364222dfd4f356b7db109ca372746..f6ad56c9901e2bbc6adbac61320ba4b5e24eeebe 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -34,7 +34,7 @@ struct ltt_kernel_channel_list {
 };
 
 struct ltt_kernel_context {
-       struct lttng_kernel_context ctx;
+       struct lttng_kernel_abi_context ctx;
        struct cds_list_head list;
        /* Indicates whether or not the context is in a list. */
        bool in_list;
@@ -45,7 +45,7 @@ struct ltt_kernel_event {
        int fd;
        int enabled;
        enum lttng_event_type type;
-       struct lttng_kernel_event *event;
+       struct lttng_kernel_abi_event *event;
        struct cds_list_head list;
        char *filter_expression;
        struct lttng_bytecode *filter;
@@ -55,6 +55,7 @@ struct ltt_kernel_event {
 /* Kernel event */
 struct ltt_kernel_event_notifier_rule {
        int fd;
+       uint64_t error_counter_index;
        int enabled;
        enum lttng_event_type type;
        struct lttng_trigger *trigger;
@@ -163,16 +164,18 @@ struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
                unsigned int count);
 struct ltt_kernel_context *trace_kernel_create_context(
-               struct lttng_kernel_context *ctx);
+               struct lttng_kernel_abi_context *ctx);
+/* Trigger is only non-const to acquire a reference. */
 enum lttng_error_code trace_kernel_create_event_notifier_rule(
                struct lttng_trigger *trigger,
                uint64_t token,
+               uint64_t error_counter_index,
                struct ltt_kernel_event_notifier_rule **event_notifier_rule);
 struct ltt_kernel_context *trace_kernel_copy_context(
                struct ltt_kernel_context *ctx);
 enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
                const struct lttng_event_rule *rule,
-               struct lttng_kernel_event_notifier *kernel_event_notifier);
+               struct lttng_kernel_abi_event_notifier *kernel_event_notifier);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if