Refactoring: move enablers list into common structure
[lttng-modules.git] / include / lttng / events-internal.h
index 8ac1869bf064b2d44fa1a0650e08c6bde881da6a..39446ebeda3d43ba11232123d519edd87d1c0d75 100644 (file)
@@ -77,6 +77,10 @@ struct lttng_kernel_event_common_private {
        int has_enablers_without_filter_bytecode;
        /* list of struct lttng_kernel_bytecode_runtime, sorted by seqnum */
        struct list_head filter_bytecode_runtime_head;
+
+       struct hlist_node hlist_node;                   /* node in events hash table */
+       struct list_head node;                          /* node in event list */
+
        enum lttng_kernel_abi_instrumentation instrumentation;
        /* Selected by instrumentation */
        union {
@@ -99,8 +103,6 @@ struct lttng_kernel_event_recorder_private {
        struct lttng_kernel_event_common_private parent;
 
        struct lttng_kernel_event_recorder *pub;        /* Public event interface */
-       struct list_head node;                          /* Event recorder list */
-       struct hlist_node hlist;                        /* Hash table of event recorders */
        struct lttng_kernel_ctx *ctx;
        unsigned int id;
        unsigned int metadata_dumped:1;
@@ -113,10 +115,7 @@ struct lttng_kernel_event_notifier_private {
        struct lttng_event_notifier_group *group;       /* weak ref */
        size_t num_captures;                            /* Needed to allocate the msgpack array. */
        uint64_t error_counter_index;
-       struct list_head node;                          /* Event notifier list */
-       struct hlist_node hlist;                        /* Hash table of event notifiers */
        struct list_head capture_bytecode_runtime_head;
-
 };
 
 struct lttng_kernel_syscall_table {
@@ -237,19 +236,19 @@ struct lttng_event_enabler_common {
        unsigned int enabled:1;
 
        uint64_t user_token;            /* User-provided token. */
+
+       struct list_head node;          /* list of enablers */
+       bool published;                 /* published in list. */
 };
 
 struct lttng_event_recorder_enabler {
        struct lttng_event_enabler_common parent;
-       struct list_head node;          /* per-session list of enablers */
-       bool published;                 /* published in per-session list. */
        struct lttng_kernel_channel_buffer *chan;
 };
 
 struct lttng_event_notifier_enabler {
        struct lttng_event_enabler_common parent;
        uint64_t error_counter_index;
-       struct list_head node;  /* List of event_notifier enablers */
        struct lttng_event_notifier_group *group;
 
        /* head list of struct lttng_kernel_bytecode_node */
@@ -410,11 +409,11 @@ struct lttng_counter {
        struct lttng_counter_ops *ops;
 };
 
-#define LTTNG_EVENT_NOTIFIER_HT_BITS           12
-#define LTTNG_EVENT_NOTIFIER_HT_SIZE           (1U << LTTNG_EVENT_NOTIFIER_HT_BITS)
+#define LTTNG_EVENT_HT_BITS            12
+#define LTTNG_EVENT_HT_SIZE            (1U << LTTNG_EVENT_HT_BITS)
 
-struct lttng_event_notifier_ht {
-       struct hlist_head table[LTTNG_EVENT_NOTIFIER_HT_SIZE];
+struct lttng_event_ht {
+       struct hlist_head table[LTTNG_EVENT_HT_SIZE];
 };
 
 struct lttng_event_notifier_group {
@@ -423,7 +422,7 @@ struct lttng_event_notifier_group {
        struct list_head node;          /* event notifier group list */
        struct list_head enablers_head; /* List of enablers */
        struct list_head event_notifiers_head; /* List of event notifier */
-       struct lttng_event_notifier_ht event_notifiers_ht; /* Hash table of event notifiers */
+       struct lttng_event_ht events_ht; /* Hash table of event notifiers */
        struct lttng_kernel_channel_buffer_ops *ops;
        struct lttng_transport *transport;
        struct lttng_kernel_ring_buffer_channel *chan;          /* Ring buffer channel for event notifier group. */
@@ -451,13 +450,6 @@ struct lttng_counter_transport {
        struct lttng_counter_ops ops;
 };
 
-#define LTTNG_EVENT_HT_BITS            12
-#define LTTNG_EVENT_HT_SIZE            (1U << LTTNG_EVENT_HT_BITS)
-
-struct lttng_event_ht {
-       struct hlist_head table[LTTNG_EVENT_HT_SIZE];
-};
-
 struct lttng_kernel_session_private {
        struct lttng_kernel_session *pub;       /* Public session interface */
 
@@ -600,6 +592,48 @@ struct lttng_event_enabler_common *lttng_event_notifier_enabler_as_enabler(
        return &event_notifier_enabler->parent;
 }
 
+static inline
+struct lttng_event_ht *lttng_get_event_ht_from_enabler(struct lttng_event_enabler_common *event_enabler)
+{
+       switch (event_enabler->enabler_type) {
+       case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+       {
+               struct lttng_event_recorder_enabler *event_recorder_enabler =
+                       container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+               return &event_recorder_enabler->chan->parent.session->priv->events_ht;
+       }
+       case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+       {
+               struct lttng_event_notifier_enabler *event_notifier_enabler =
+                       container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+               return &event_notifier_enabler->group->events_ht;
+       }
+       default:
+               return NULL;
+       }
+}
+
+static inline
+struct list_head *lttng_get_event_list_head_from_enabler(struct lttng_event_enabler_common *event_enabler)
+{
+       switch (event_enabler->enabler_type) {
+       case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+       {
+               struct lttng_event_recorder_enabler *event_recorder_enabler =
+                       container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+               return &event_recorder_enabler->chan->parent.session->priv->events;
+       }
+       case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+       {
+               struct lttng_event_notifier_enabler *event_notifier_enabler =
+                       container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+               return &event_notifier_enabler->group->event_notifiers_head;
+       }
+       default:
+               return NULL;
+       }
+}
+
 int lttng_context_init(void);
 void lttng_context_exit(void);
 int lttng_kernel_context_append(struct lttng_kernel_ctx **ctx_p,
@@ -787,9 +821,11 @@ void lttng_event_enabler_session_add(struct lttng_kernel_session *session,
                struct lttng_event_recorder_enabler *event_enabler);
 
 struct lttng_event_notifier_enabler *lttng_event_notifier_enabler_create(
-               struct lttng_event_notifier_group *event_notifier_group,
                enum lttng_enabler_format_type format_type,
-               struct lttng_kernel_abi_event_notifier *event_notifier_param);
+               struct lttng_kernel_abi_event_notifier *event_notifier_param,
+               struct lttng_event_notifier_group *event_notifier_group);
+void lttng_event_notifier_enabler_group_add(struct lttng_event_notifier_group *event_notifier_group,
+               struct lttng_event_notifier_enabler *event_notifier_enabler);
 int lttng_event_notifier_enabler_attach_capture_bytecode(
                struct lttng_event_notifier_enabler *event_notifier_enabler,
                struct lttng_kernel_abi_capture_bytecode __user *bytecode);
@@ -800,8 +836,13 @@ int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler_common
                struct lttng_kernel_abi_filter_bytecode __user *bytecode);
 void lttng_event_enabler_destroy(struct lttng_event_enabler_common *event_enabler);
 
-int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+bool lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
                struct lttng_event_enabler_common *enabler);
+bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler,
+               struct lttng_kernel_event_common *event);
+bool lttng_event_enabler_desc_match_event(struct lttng_event_enabler_common *event_enabler,
+               const struct lttng_kernel_event_desc *desc,
+               struct lttng_kernel_event_common *event);
 
 void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_desc,
                struct lttng_kernel_ctx *ctx,
@@ -809,34 +850,29 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des
                struct list_head *enabler_bytecode_runtime_head);
 
 #if defined(CONFIG_HAVE_SYSCALL_TRACEPOINTS)
-int lttng_syscalls_register_event_recorder(struct lttng_event_recorder_enabler *event_enabler);
-int lttng_syscall_filter_enable_event_recorder(struct lttng_kernel_event_recorder *event_recorder);
-int lttng_syscall_filter_disable_event_recorder(struct lttng_kernel_event_recorder *event_recorder);
+int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler);
+int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event);
+int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event);
 
 int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table);
 int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table);
 
-long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel,
+long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table,
                struct lttng_kernel_abi_syscall_mask __user *usyscall_mask);
 
-int lttng_syscalls_register_event_notifier(
-               struct lttng_event_notifier_enabler *event_notifier_enabler);
-int lttng_syscalls_create_matching_event_notifiers(
-               struct lttng_event_notifier_enabler *event_notifier_enabler);
-int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
-int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
+void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler);
 #else
-static inline int lttng_syscalls_register_event_recorder(struct lttng_event_recorder_enabler *event_enabler)
+static inline int lttng_syscalls_register_event(struct lttng_event_enabler_common *event_enabler)
 {
        return -ENOSYS;
 }
 
-static inline int lttng_syscall_filter_enable_event_recorder(struct lttng_kernel_event_recorder *event_recorder)
+static inline int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event)
 {
        return -ENOSYS;
 }
 
-static inline int lttng_syscall_filter_disable_event_recorder(struct lttng_kernel_event_recorder *event_recorder)
+static inline int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event)
 {
        return -ENOSYS;
 }
@@ -851,14 +887,8 @@ static inline int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_sysca
        return 0;
 }
 
-static inline long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel,
-               struct lttng_kernel_syscall_mask __user *usyscall_mask)
-{
-       return -ENOSYS;
-}
-
-static inline int lttng_syscalls_register_event_notifier(
-               struct lttng_event_notifier_group *group)
+static inline long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table,
+               struct lttng_kernel_abi_syscall_mask __user *usyscall_mask)
 {
        return -ENOSYS;
 }
@@ -868,16 +898,9 @@ static inline int lttng_syscalls_create_matching_event_notifiers(struct lttng_ev
        return -ENOSYS;
 }
 
-static inline int lttng_syscall_filter_enable_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
-{
-       return -ENOSYS;
-}
-
-static inline int lttng_syscall_filter_disable_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
+static inline void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler)
 {
-       return -ENOSYS;
 }
-
 #endif
 
 #ifdef CONFIG_KPROBES
@@ -885,52 +908,27 @@ int lttng_kprobes_register_event(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_kernel_event_recorder *event);
-void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event);
-void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
-int lttng_kprobes_register_event_notifier(const char *symbol_name,
-               uint64_t offset,
-               uint64_t addr,
-               struct lttng_kernel_event_notifier *event_notifier);
-void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
+               struct lttng_kernel_event_common *event);
+void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event);
+void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event);
 #else
 static inline
 int lttng_kprobes_register_event(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_kernel_event_recorder *event)
-{
-       return -ENOSYS;
-}
-
-static inline
-void lttng_kprobes_unregister_event(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-int lttng_kprobes_register_event_notifier(const char *symbol_name,
-               uint64_t offset,
-               uint64_t addr,
-               struct lttng_kernel_event_notifier *event_notifier)
+               struct lttng_kernel_event_common *event)
 {
        return -ENOSYS;
 }
 
 static inline
-void lttng_kprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
+void lttng_kprobes_unregister_event(struct lttng_kernel_event_common *event)
 {
 }
 
 static inline
-void lttng_kprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
+void lttng_kprobes_destroy_event_private(struct lttng_kernel_event_common *event)
 {
 }
 #endif
@@ -940,19 +938,15 @@ int lttng_event_add_callsite(struct lttng_kernel_event_common *event,
 
 #ifdef CONFIG_UPROBES
 int lttng_uprobes_register_event(const char *name,
-       int fd, struct lttng_kernel_event_recorder *event);
+       int fd, struct lttng_kernel_event_common *event);
 int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
        struct lttng_kernel_abi_event_callsite __user *callsite);
-void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event);
-void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event);
-int lttng_uprobes_register_event_notifier(const char *name,
-       int fd, struct lttng_kernel_event_notifier *event_notifier);
-void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier);
-void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier);
+void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event);
+void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event);
 #else
 static inline
 int lttng_uprobes_register_event(const char *name,
-       int fd, struct lttng_kernel_event_recorder *event)
+       int fd, struct lttng_kernel_event_common *event)
 {
        return -ENOSYS;
 }
@@ -965,29 +959,12 @@ int lttng_uprobes_event_add_callsite(struct lttng_kernel_event_common *event,
 }
 
 static inline
-void lttng_uprobes_unregister_event(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_recorder *event)
-{
-}
-
-static inline
-int lttng_uprobes_register_event_notifier(const char *name,
-       int fd, struct lttng_kernel_event_notifier *event_notifier)
-{
-       return -ENOSYS;
-}
-
-static inline
-void lttng_uprobes_unregister_event_notifier(struct lttng_kernel_event_notifier *event_notifier)
+void lttng_uprobes_unregister_event(struct lttng_kernel_event_common *event)
 {
 }
 
 static inline
-void lttng_uprobes_destroy_event_notifier_private(struct lttng_kernel_event_notifier *event_notifier)
+void lttng_uprobes_destroy_event_private(struct lttng_kernel_event_common *event)
 {
 }
 #endif
@@ -997,10 +974,10 @@ int lttng_kretprobes_register(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_kernel_event_recorder *event_entry,
-               struct lttng_kernel_event_recorder *event_exit);
-void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event);
-void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event);
+               struct lttng_kernel_event_common *event_entry,
+               struct lttng_kernel_event_common *event_exit);
+void lttng_kretprobes_unregister(struct lttng_kernel_event_common *event);
+void lttng_kretprobes_destroy_private(struct lttng_kernel_event_common *event);
 int lttng_kretprobes_event_enable_state(struct lttng_kernel_event_common *event,
        int enable);
 #else
@@ -1009,19 +986,19 @@ int lttng_kretprobes_register(const char *name,
                const char *symbol_name,
                uint64_t offset,
                uint64_t addr,
-               struct lttng_kernel_event_recorder *event_entry,
-               struct lttng_kernel_event_recorder *event_exit)
+               struct lttng_kernel_event_common *event_entry,
+               struct lttng_kernel_event_common *event_exit)
 {
        return -ENOSYS;
 }
 
 static inline
-void lttng_kretprobes_unregister(struct lttng_kernel_event_recorder *event)
+void lttng_kretprobes_unregister(struct lttng_kernel_event_common *event)
 {
 }
 
 static inline
-void lttng_kretprobes_destroy_private(struct lttng_kernel_event_recorder *event)
+void lttng_kretprobes_destroy_private(struct lttng_kernel_event_common *event)
 {
 }
 
@@ -1083,28 +1060,10 @@ struct lttng_kernel_channel_buffer *lttng_global_channel_create(struct lttng_ker
                                       unsigned int read_timer_interval);
 
 void lttng_metadata_channel_destroy(struct lttng_kernel_channel_buffer *chan);
-struct lttng_kernel_event_recorder *lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler,
+struct lttng_kernel_event_common *_lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
                                const struct lttng_kernel_event_desc *event_desc);
-struct lttng_kernel_event_recorder *_lttng_kernel_event_recorder_create(struct lttng_event_recorder_enabler *event_enabler,
+struct lttng_kernel_event_common *lttng_kernel_event_create(struct lttng_event_enabler_common *event_enabler,
                                const struct lttng_kernel_event_desc *event_desc);
-struct lttng_kernel_event_recorder *lttng_event_compat_old_create(struct lttng_kernel_channel_buffer *chan,
-               struct lttng_kernel_abi_old_event *old_event_param,
-               const struct lttng_kernel_event_desc *internal_desc);
-
-struct lttng_kernel_event_notifier *lttng_event_notifier_create(
-                               const struct lttng_kernel_event_desc *event_notifier_desc,
-                               uint64_t id,
-                               uint64_t error_counter_idx,
-                               struct lttng_event_notifier_group *event_notifier_group,
-                               struct lttng_kernel_abi_event_notifier *event_notifier_param,
-                               enum lttng_kernel_abi_instrumentation itype);
-struct lttng_kernel_event_notifier *_lttng_event_notifier_create(
-                               const struct lttng_kernel_event_desc *event_notifier_desc,
-                               uint64_t id,
-                               uint64_t error_counter_idx,
-                               struct lttng_event_notifier_group *event_notifier_group,
-                               struct lttng_kernel_abi_event_notifier *event_notifier_param,
-                               enum lttng_kernel_abi_instrumentation itype);
 
 int lttng_channel_enable(struct lttng_kernel_channel_common *channel);
 int lttng_channel_disable(struct lttng_kernel_channel_common *channel);
This page took 0.029462 seconds and 4 git commands to generate.