X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Flttng-bytecode.h;h=6313b2cc179d973092a95ebb31605a06325782ab;hb=8c71721f7a868b575b05e24bc3a3dcc967e6d5d6;hp=ac4c738bf12efc4260b15cc11677acffaaeed1c5;hpb=99d223adfae9b68800e91bda470c92acb14efae6;p=lttng-modules.git

diff --git a/include/lttng/lttng-bytecode.h b/include/lttng/lttng-bytecode.h
index ac4c738b..6313b2cc 100644
--- a/include/lttng/lttng-bytecode.h
+++ b/include/lttng/lttng-bytecode.h
@@ -96,7 +96,7 @@ struct bytecode_get_index_data {
 	 * interpreter needs to find it from the event fields and types to
 	 * support variants.
 	 */
-	const struct lttng_event_field *field;
+	const struct lttng_kernel_event_field *field;
 	struct {
 		size_t len;
 		enum object_type type;
@@ -108,7 +108,7 @@ struct bytecode_get_index_data {
 struct vstack_load {
 	enum load_type type;
 	enum object_type object_type;
-	const struct lttng_event_field *field;
+	const struct lttng_kernel_event_field *field;
 	bool rev_bo;	/* reverse byte order */
 };
 
@@ -185,7 +185,7 @@ struct load_ptr {
 		uint64_t u64;
 		double d;
 	} u;
-	const struct lttng_event_field *field;
+	const struct lttng_kernel_event_field *field;
 };
 
 struct estack_entry {
@@ -277,33 +277,26 @@ struct lttng_interpreter_output {
 			size_t nr_elem;
 
 			/* Inner type. */
-			const struct lttng_type *nested_type;
+			const struct lttng_kernel_type_common *nested_type;
 		} sequence;
 	} u;
 };
 
 const char *lttng_bytecode_print_op(enum bytecode_op op);
 
-void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime);
-void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime);
+void lttng_bytecode_sync_state(struct lttng_bytecode_runtime *runtime);
 int lttng_bytecode_validate(struct bytecode_runtime *bytecode);
-int lttng_bytecode_specialize(const struct lttng_event_desc *event_desc,
+int lttng_bytecode_specialize(const struct lttng_kernel_event_desc *event_desc,
 		struct bytecode_runtime *bytecode);
 
-uint64_t lttng_bytecode_filter_interpret_false(void *filter_data,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		const char *filter_stack_data);
-uint64_t lttng_bytecode_filter_interpret(void *filter_data,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		const char *filter_stack_data);
+int lttng_bytecode_interpret_error(struct lttng_bytecode_runtime *bytecode_runtime,
+		const char *stack_data,
+		struct lttng_probe_ctx *probe_ctx,
+		void *ctx);
 
-uint64_t lttng_bytecode_capture_interpret_false(void *capture_data,
-		struct lttng_probe_ctx *lttng_probe_ctx,
-		const char *capture_stack_data,
-		struct lttng_interpreter_output *output);
-uint64_t lttng_bytecode_capture_interpret(void *capture_data,
+int lttng_bytecode_interpret(struct lttng_bytecode_runtime *kernel_bytecode,
+		const char *interpreter_stack_data,
 		struct lttng_probe_ctx *lttng_probe_ctx,
-		const char *capture_stack_data,
-		struct lttng_interpreter_output *output);
+		void *caller_ctx);
 
 #endif /* _LTTNG_FILTER_H */