Cleanup: remove old comments

[lttng-ust.git] / liblttng-ust / ust-events-internal.h

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index d79278d7ec513958c1032c4db9c1497bb827cd5d..53c76d57c2d9d44f41086e2f7d7e46e6fb39a641 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -94,13 +94,13 @@ struct lttng_event_notifier_enabler {
        uint64_t num_captures;
 };
 
-enum lttng_ust_bytecode_node_type {
-       LTTNG_UST_BYTECODE_NODE_TYPE_FILTER,
-       LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE,
+enum lttng_ust_bytecode_type {
+       LTTNG_UST_BYTECODE_TYPE_FILTER,
+       LTTNG_UST_BYTECODE_TYPE_CAPTURE,
 };
 
 struct lttng_ust_bytecode_node {
-       enum lttng_ust_bytecode_node_type type;
+       enum lttng_ust_bytecode_type type;
        struct cds_list_head node;
        struct lttng_enabler *enabler;
        struct  {
@@ -111,6 +111,26 @@ struct lttng_ust_bytecode_node {
        } bc;
 };
 
+/*
+ * Bytecode interpreter return value.
+ */
+enum lttng_ust_bytecode_interpreter_ret {
+       LTTNG_UST_BYTECODE_INTERPRETER_ERROR = -1,
+       LTTNG_UST_BYTECODE_INTERPRETER_OK = 0,
+};
+
+struct lttng_interpreter_output;
+struct lttng_ust_bytecode_runtime_private;
+
+enum lttng_ust_bytecode_filter_result {
+       LTTNG_UST_BYTECODE_FILTER_ACCEPT = 0,
+       LTTNG_UST_BYTECODE_FILTER_REJECT = 1,
+};
+
+struct lttng_ust_bytecode_filter_ctx {
+       enum lttng_ust_bytecode_filter_result result;
+};
+
 struct lttng_ust_excluder_node {
        struct cds_list_head node;
        struct lttng_enabler *enabler;
@@ -250,6 +270,10 @@ struct lttng_ust_event_common_private {
        struct cds_list_head enablers_ref_head;
        int registered;                 /* has reg'd tracepoint probe */
        uint64_t user_token;
+
+       int has_enablers_without_filter_bytecode;
+       /* list of struct lttng_ust_bytecode_runtime, sorted by seqnum */
+       struct cds_list_head filter_bytecode_runtime_head;
 };
 
 struct lttng_ust_event_recorder_private {
@@ -258,6 +282,7 @@ struct lttng_ust_event_recorder_private {
        struct lttng_ust_event_recorder *pub;   /* Public event interface */
        struct cds_list_head node;              /* Event recorder list */
        struct cds_hlist_node hlist;            /* Hash table of event recorders */
+       struct lttng_ust_ctx *ctx;
 };
 
 struct lttng_ust_event_notifier_private {
@@ -269,13 +294,18 @@ struct lttng_ust_event_notifier_private {
        uint64_t error_counter_index;
        struct cds_list_head node;              /* Event notifier list */
        struct cds_hlist_node hlist;            /* Hash table of event notifiers */
-};
+       struct cds_list_head capture_bytecode_runtime_head;
 
-struct lttng_ust_bytecode_runtime_private {
-       struct bytecode_runtime *pub;   /* Public bytecode runtime interface */
+};
 
+struct lttng_ust_bytecode_runtime {
+       enum lttng_ust_bytecode_type type;
        struct lttng_ust_bytecode_node *bc;
        int link_failed;
+       int (*interpreter_func)(struct lttng_ust_bytecode_runtime *bytecode_runtime,
+                       const char *interpreter_stack_data,
+                       void *ctx);
+       struct cds_list_head node;      /* list of bytecode runtime in event */
        /*
         * Pointer to a URCU-protected pointer owned by an `struct
         * lttng_session`or `struct lttng_event_notifier_group`.
@@ -292,17 +322,14 @@ struct lttng_ust_session_private {
        struct cds_list_head events_head;       /* list of events */
        struct cds_list_head node;              /* Session list */
 
-       /* New UST 2.1 */
        /* List of enablers */
        struct cds_list_head enablers_head;
        struct lttng_ust_event_ht events_ht;    /* ht of events */
        void *owner;                            /* object owner */
        int tstate:1;                           /* Transient enable state */
 
-       /* New UST 2.4 */
        int statedump_pending:1;
 
-       /* New UST 2.8 */
        struct lttng_ust_enum_ht enums_ht;      /* ht of enumerations */
        struct cds_list_head enums_head;
        struct lttng_ust_ctx *ctx;                      /* contexts for filters. */
@@ -359,6 +386,7 @@ struct lttng_ust_channel_buffer_private {
        int header_type;                /* 0: unset, 1: compact, 2: large */
        unsigned int id;                /* Channel ID */
        enum lttng_ust_abi_chan_type type;
+       struct lttng_ust_ctx *ctx;
        unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 };
 
@@ -861,4 +889,9 @@ struct lttng_ust_channel_buffer *lttng_ust_alloc_channel_buffer(void);
 __attribute__((visibility("hidden")))
 void lttng_ust_free_channel_common(struct lttng_ust_channel_common *chan);
 
+__attribute__((visibility("hidden")))
+int lttng_ust_interpret_event_filter(struct lttng_ust_event_common *event,
+               const char *interpreter_stack_data,
+               void *filter_ctx);
+
 #endif /* _LTTNG_UST_EVENTS_INTERNAL_H */