X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=5bd158386cdfeba881597d5b1bc3c0b17076ee94;hb=86133cafe8f32497f53f4b469b8d3357470e7080;hp=d89ddea6147a5659b694af6b53d11dba71861a85;hpb=d8d2416dab454962b90222ba46c82cdce0c666a4;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index d89ddea6..5bd15838 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -315,6 +315,7 @@ struct lttng_ctx_value {
 	enum lttng_ust_dynamic_type sel;
 	union {
 		int64_t s64;
+		uint64_t u64;
 		const char *str;
 		double d;
 	} u;
@@ -426,11 +427,11 @@ struct ust_pending_probe;
 struct lttng_event;
 
 /*
- * Filter return value masks.
+ * Bytecode interpreter return value masks.
  */
-enum lttng_filter_ret {
-	LTTNG_FILTER_DISCARD = 0,
-	LTTNG_FILTER_RECORD_FLAG = (1ULL << 0),
+enum lttng_bytecode_interpreter_ret {
+	LTTNG_INTERPRETER_DISCARD = 0,
+	LTTNG_INTERPRETER_RECORD_FLAG = (1ULL << 0),
 	/* Other bits are kept for future use. */
 };
 
@@ -442,8 +443,11 @@ enum lttng_filter_ret {
  */
 struct lttng_bytecode_runtime {
 	/* Associated bytecode */
-	struct lttng_ust_filter_bytecode_node *bc;
-	uint64_t (*filter)(void *filter_data, const char *filter_stack_data);
+	struct lttng_ust_bytecode_node *bc;
+	union {
+		uint64_t (*filter)(void *interpreter_data,
+				const char *interpreter_stack_data);
+	} interpreter_funcs;
 	int link_failed;
 	struct cds_list_head node;	/* list of bytecode runtime in event */
 	/*
@@ -491,7 +495,7 @@ struct lttng_event {
 
 	/* LTTng-UST 2.1 starts here */
 	/* list of struct lttng_bytecode_runtime, sorted by seqnum */
-	struct cds_list_head bytecode_runtime_head;
+	struct cds_list_head filter_bytecode_runtime_head;
 	int has_enablers_without_bytecode;
 	/* Backward references: list of lttng_enabler_ref (ref to enablers) */
 	struct cds_list_head enablers_ref_head;
@@ -709,8 +713,6 @@ int lttng_channel_disable(struct lttng_channel *channel);
 int lttng_attach_context(struct lttng_ust_context *context_param,
 		union ust_args *uargs,
 		struct lttng_ctx **ctx, struct lttng_session *session);
-int lttng_session_context_init(struct lttng_ctx **ctx);
-
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
 
@@ -811,7 +813,6 @@ struct lttng_ust_field_iter *
 	lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list);
 
 void lttng_free_event_filter_runtime(struct lttng_event *event);
-void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime);
 
 struct cds_list_head *lttng_get_probe_list_head(void);
 int lttng_session_active(void);
@@ -847,6 +848,9 @@ int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler,
 		struct lttng_ust_excluder_node *excluder);
 void lttng_enabler_event_link_bytecode(struct lttng_event *event,
 		struct lttng_enabler *enabler);
+void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime);
+int lttng_session_context_init(struct lttng_ctx **ctx);
+
 
 #ifdef __cplusplus
 }