X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=e8e4bf2cac12d254bd11ae884847c2f4367bcf64;hb=7433d32d5a8f0e8833461b586a8c8b2274da0141;hp=4ef3301c12ae42c807aa67b94b51056ffcc150df;hpb=e7bc0ef6c86ae97886cf5f8b28854cf281d4962b;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 4ef3301c..e8e4bf2c 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -296,44 +296,6 @@ struct lttng_ust_probe_desc {
 
 /* Data structures used by the tracer. */
 
-/*
- * Bytecode interpreter return value masks.
- */
-enum lttng_ust_bytecode_interpreter_ret {
-	LTTNG_UST_BYTECODE_INTERPRETER_DISCARD = 0,
-	LTTNG_UST_BYTECODE_INTERPRETER_RECORD_FLAG = (1ULL << 0),
-	/* Other bits are kept for future use. */
-};
-
-struct lttng_interpreter_output;
-struct lttng_ust_bytecode_runtime_private;
-
-/*
- * 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.
- *
- * The field @struct_size should be used to determine the size of the
- * structure. It should be queried before using additional fields added
- * at the end of the structure.
- */
-struct lttng_ust_bytecode_runtime {
-	uint32_t struct_size;			/* Size of this structure. */
-
-	struct lttng_ust_bytecode_runtime_private *priv;
-	/* Associated bytecode */
-	union {
-		uint64_t (*filter)(void *interpreter_data,
-				const char *interpreter_stack_data);
-		uint64_t (*capture)(void *interpreter_data,
-				const char *interpreter_stack_data,
-				struct lttng_interpreter_output *interpreter_output);
-	} interpreter_funcs;
-	struct cds_list_head node;	/* list of bytecode runtime in event */
-
-	/* End of base ABI. Fields below should be used after checking struct_size. */
-};
-
 /*
  * lttng_event structure is referred to by the tracing fast path. It
  * must be kept small.
@@ -351,6 +313,14 @@ enum lttng_ust_event_type {
 	LTTNG_UST_EVENT_TYPE_NOTIFIER = 1,
 };
 
+/*
+ * Result of the run_filter() callback.
+ */
+enum lttng_ust_event_filter_result {
+	LTTNG_UST_EVENT_FILTER_ACCEPT = 0,
+	LTTNG_UST_EVENT_FILTER_REJECT = 1,
+};
+
 /*
  * 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
@@ -375,9 +345,10 @@ struct lttng_ust_event_common {
 	void *child;					/* Pointer to child, for inheritance by aggregation. */
 
 	int enabled;
-	int has_enablers_without_bytecode;
-	/* list of struct lttng_ust_bytecode_runtime, sorted by seqnum */
-	struct cds_list_head filter_bytecode_runtime_head;
+	int eval_filter;				/* Need to evaluate filters */
+	int (*run_filter)(struct lttng_ust_event_common *event,
+		const char *stack_data,
+		void *filter_ctx);
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
@@ -406,7 +377,22 @@ struct lttng_ust_event_recorder {
 
 	unsigned int id;
 	struct lttng_ust_channel_buffer *chan;
-	struct lttng_ust_ctx *ctx;
+
+	/* End of base ABI. Fields below should be used after checking struct_size. */
+};
+
+/*
+ * 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.
+ *
+ * The field @struct_size should be used to determine the size of the
+ * structure. It should be queried before using additional fields added
+ * at the end of the structure.
+ */
+struct lttng_ust_notification_ctx {
+	uint32_t struct_size;		/* Size of this structure. */
+	int eval_capture;		/* Capture evaluation available. */
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
@@ -433,9 +419,10 @@ struct lttng_ust_event_notifier {
 	struct lttng_ust_event_common *parent;		/* Inheritance by aggregation. */
 	struct lttng_ust_event_notifier_private *priv;	/* Private event notifier interface */
 
+	int eval_capture;				/* Need to evaluate capture */
 	void (*notification_send)(struct lttng_ust_event_notifier *event_notifier,
-		const char *stack_data);
-	struct cds_list_head capture_bytecode_runtime_head;
+		const char *stack_data,
+		struct lttng_ust_notification_ctx *notif_ctx);
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };
@@ -514,7 +501,6 @@ struct lttng_ust_channel_buffer {
 	struct lttng_ust_channel_common *parent;	/* Inheritance by aggregation. */
 	struct lttng_ust_channel_buffer_private *priv;	/* Private channel buffer interface */
 
-	struct lttng_ust_ctx *ctx;
 	struct lttng_ust_channel_ops *ops;
 	struct lttng_ust_lib_ring_buffer_channel *chan;	/* Channel buffers */
 	struct lttng_ust_shm_handle *handle;		/* shared-memory handle */
@@ -535,8 +521,6 @@ struct lttng_ust_stack_ctx {
 	uint32_t struct_size;			/* Size of this structure */
 
 	struct lttng_ust_event_recorder *event_recorder;
-	struct lttng_ust_ctx *chan_ctx;	/* RCU dereferenced. */
-	struct lttng_ust_ctx *event_ctx;	/* RCU dereferenced. */
 
 	/* End of base ABI. Fields below should be used after checking struct_size. */
 };