Distinguish UST return codes from transport return codes

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 5edfbb99f88019565669adaf735cefa2e6cc3b12..0e19ed2229ac9c7b417aee01be5113e0701351fe 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,7 @@ 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;
+       struct lttng_ust_filter_bytecode *filter_bytecode;
        unsigned int enabled:1;
 };
 
@@ -257,6 +270,7 @@ 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;
+       struct lttng_ust_filter_bytecode *filter_bytecode;
        int loglevel;
        char name[0];
 };
@@ -283,17 +297,23 @@ struct lttng_ust_field_list {
 
 struct ust_pending_probe;
 struct ltt_event;
+struct lttng_ust_filter_bytecode;
 
 /*
  * 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;
-       void (*filter)(struct ltt_event *event);
+       int (*filter)(void *filter_data, const char *filter_stack_data);
        struct lttng_ctx *ctx;
        enum lttng_ust_instrumentation instrumentation;
        union {
@@ -302,11 +322,19 @@ 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 */
+       struct lttng_ust_filter_bytecode *filter_bytecode;
+       void *filter_data;
 };
 
 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,
@@ -342,6 +370,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
@@ -369,6 +402,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 ? */
@@ -413,7 +451,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,
-               void (*filter)(struct ltt_event *event),
                struct ltt_event **event);
 
 int ltt_channel_enable(struct ltt_channel *channel);
@@ -470,5 +507,12 @@ 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 *filter);
+int lttng_filter_wildcard_attach_bytecode(struct session_wildcard *wildcard,
+                struct lttng_ust_filter_bytecode *filter);
+void lttng_filter_event_link_bytecode(struct ltt_event *event,
+               struct lttng_ust_filter_bytecode *filter_bytecode);
+void lttng_filter_wildcard_link_bytecode(struct session_wildcard *wildcard);
 
 #endif /* _LTTNG_UST_EVENTS_H */