Filter iteration: iterate on list of filters

[lttng-ust.git] / include / lttng / ust-events.h

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 91d5839bfa6c1386ea13f9160207e7c27413be3e..1378a350fb867c35871257ae46c585459d8ccac4 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -179,12 +179,19 @@ struct lttng_enum {
        char padding[LTTNG_UST_ENUM_TYPE_PADDING];
 };
 
-/* Event field description */
+/*
+ * Event field description
+ *
+ * IMPORTANT: this structure is part of the ABI between the probe and
+ * UST. Fields need to be only added at the end, never reordered, never
+ * removed.
+ */
 
-#define LTTNG_UST_EVENT_FIELD_PADDING  32
+#define LTTNG_UST_EVENT_FIELD_PADDING  28
 struct lttng_event_field {
        const char *name;
        struct lttng_type type;
+       unsigned int nowrite;   /* do not write into trace */
        char padding[LTTNG_UST_EVENT_FIELD_PADDING];
 };
 
@@ -218,7 +225,12 @@ struct lttng_event_desc {
        unsigned int nr_fields;
        const int **loglevel;
        const char *signature;  /* Argument types/names received */
-       char padding[LTTNG_UST_EVENT_DESC_PADDING];
+       union {
+               struct {
+                       const char **model_emf_uri;
+               } ext;
+               char padding[LTTNG_UST_EVENT_DESC_PADDING];
+       } u;
 };
 
 #define LTTNG_UST_PROBE_DESC_PADDING   40
@@ -245,6 +257,8 @@ struct session_wildcard {
        struct cds_list_head list;      /* per-session list of wildcards */
        struct cds_list_head session_list; /* node of session wildcard list */
        struct wildcard_entry *entry;
+       /* list of struct lttng_ust_filter_bytecode_node */
+       struct cds_list_head filter_bytecode;
        unsigned int enabled:1;
 };
 
@@ -257,6 +271,8 @@ struct wildcard_entry {
        /* head of session list to which this wildcard apply */
        struct cds_list_head session_list;
        enum lttng_ust_loglevel_type loglevel_type;
+       /* list of struct lttng_ust_filter_bytecode_node */
+       struct cds_list_head filter_bytecode;
        int loglevel;
        char name[0];
 };
@@ -284,17 +300,33 @@ struct lttng_ust_field_list {
 struct ust_pending_probe;
 struct ltt_event;
 
+struct lttng_ust_filter_bytecode_node {
+       struct cds_list_head node;
+       struct lttng_ust_filter_bytecode bc;
+};
+
+struct lttng_bytecode_runtime {
+       /* Associated bytecode */
+       struct lttng_ust_filter_bytecode_node *bc;
+       int (*filter)(void *filter_data, const char *filter_stack_data);
+       struct cds_list_head node;
+};
+
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
  * kept small.
+ *
+ * IMPORTANT: this structure is part of the ABI between the probe and
+ * UST. Fields need to be only added at the end, never reordered, never
+ * removed.
  */
 struct ltt_event {
+       /* LTTng-UST 2.0 starts here */
        unsigned int id;
        struct ltt_channel *chan;
        int enabled;
        const struct lttng_event_desc *desc;
-       int (*filter)(void *filter_data, const char *filter_stack_data);
-       void *filter_data;
+       void *filter_unused;
        struct lttng_ctx *ctx;
        enum lttng_ust_instrumentation instrumentation;
        union {
@@ -303,11 +335,21 @@ struct ltt_event {
        struct cds_list_head wildcard_list;     /* Event list for wildcard */
        struct ust_pending_probe *pending_probe;
        unsigned int metadata_dumped:1;
+       /* LTTng-UST 2.1 starts here */
+       /* list of struct lttng_ust_filter_bytecode_node */
+       struct cds_list_head filter_bytecode;
+       /* list of struct lttng_bytecode_runtime */
+       struct cds_list_head bytecode_runtime;
 };
 
 struct channel;
 struct lttng_ust_shm_handle;
 
+/*
+ * IMPORTANT: this structure is part of the ABI between the probe and
+ * UST. Fields need to be only added at the end, never reordered, never
+ * removed.
+ */
 struct ltt_channel_ops {
        struct ltt_channel *(*channel_create)(const char *name,
                                void *buf_addr,
@@ -343,6 +385,11 @@ struct ltt_channel_ops {
        int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle);
 };
 
+/*
+ * IMPORTANT: this structure is part of the ABI between the probe and
+ * UST. Fields need to be only added at the end, never reordered, never
+ * removed.
+ */
 struct ltt_channel {
        /*
         * The pointers located in this private data are NOT safe to be
@@ -370,6 +417,11 @@ struct ltt_channel {
        unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 };
 
+/*
+ * IMPORTANT: this structure is part of the ABI between the probe and
+ * UST. Fields need to be only added at the end, never reordered, never
+ * removed.
+ */
 struct ltt_session {
        int active;                     /* Is trace session active ? */
        int been_active;                /* Has trace session been active ? */
@@ -414,9 +466,6 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 
 int ltt_event_create(struct ltt_channel *chan,
                struct lttng_ust_event *event_param,
-               int (*filter)(void *filter_data,
-                       const char *filter_stack_data),
-               void *filter_data,
                struct ltt_event **event);
 
 int ltt_channel_enable(struct ltt_channel *channel);
@@ -473,5 +522,16 @@ int ltt_loglevel_match(const struct lttng_event_desc *desc,
                int req_loglevel);
 void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
                                struct session_wildcard *wildcard);
+int lttng_filter_event_attach_bytecode(struct ltt_event *event,
+                struct lttng_ust_filter_bytecode_node *filter);
+int lttng_filter_wildcard_attach_bytecode(struct session_wildcard *wildcard,
+                struct lttng_ust_filter_bytecode_node *filter);
+void lttng_filter_event_link_bytecode(struct ltt_event *event);
+void lttng_filter_event_link_wildcard_bytecode(struct ltt_event *event,
+               struct session_wildcard *wildcard);
+void lttng_filter_wildcard_link_bytecode(struct session_wildcard *wildcard);
+void lttng_free_event_filter_bytecode(struct ltt_event *event);
+void lttng_free_wildcard_filter_bytecode(struct session_wildcard *wildcard);
+void lttng_free_event_filter_runtime(struct ltt_event *event);
 
 #endif /* _LTTNG_UST_EVENTS_H */