X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode-interpreter.c;h=6072aee9bd6105526e6063748c7c7e5f00b33b6f;hb=f52e590232f939bd6b5c88a483765c03e37fc733;hp=ea5eca191d988b45b0d5d5ae1ebf90236130b8ff;hpb=86133cafe8f32497f53f4b469b8d3357470e7080;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode-interpreter.c b/liblttng-ust/lttng-bytecode-interpreter.c
index ea5eca19..6072aee9 100644
--- a/liblttng-ust/lttng-bytecode-interpreter.c
+++ b/liblttng-ust/lttng-bytecode-interpreter.c
@@ -27,9 +27,8 @@
 #define _LGPL_SOURCE
 #include <stddef.h>
 #include <stdint.h>
-#include <urcu-pointer.h>
-#include <byteswap.h>
 
+#include <lttng/urcu/pointer.h>
 #include <lttng/ust-endian.h>
 #include <lttng/ust-events.h>
 
@@ -172,6 +171,13 @@ uint64_t lttng_bytecode_filter_interpret_false(void *filter_data,
 	return LTTNG_INTERPRETER_DISCARD;
 }
 
+uint64_t lttng_bytecode_capture_interpret_false(void *capture_data,
+		const char *capture_stack_data,
+		struct lttng_interpreter_output *output)
+{
+	return LTTNG_INTERPRETER_DISCARD;
+}
+
 #ifdef INTERPRETER_USE_SWITCH
 
 /*
@@ -751,9 +757,12 @@ again:
 }
 
 /*
- * Return 0 (discard), or raise the 0x1 flag (log event).
- * Currently, other flags are kept for future extensions and have no
- * effect.
+ * For `output` equal to NULL:
+ *  Return 0 (discard), or raise the 0x1 flag (log event).
+ *  Currently, other flags are kept for future extensions and have no
+ *  effect.
+ * For `output` not equal to NULL:
+ *  Return 0 on success, negative error value on error.
  */
 static
 uint64_t bytecode_interpret(void *interpreter_data,
@@ -761,7 +770,7 @@ uint64_t bytecode_interpret(void *interpreter_data,
 		struct lttng_interpreter_output *output)
 {
 	struct bytecode_runtime *bytecode = interpreter_data;
-	struct lttng_ctx *ctx = rcu_dereference(*bytecode->p.pctx);
+	struct lttng_ctx *ctx = lttng_ust_rcu_dereference(*bytecode->p.pctx);
 	void *pc, *next_pc, *start_pc;
 	int ret = -EINVAL;
 	uint64_t retval = 0;
@@ -2544,6 +2553,14 @@ uint64_t lttng_bytecode_filter_interpret(void *filter_data,
 	return bytecode_interpret(filter_data, filter_stack_data, NULL);
 }
 
+uint64_t lttng_bytecode_capture_interpret(void *capture_data,
+		const char *capture_stack_data,
+		struct lttng_interpreter_output *output)
+{
+	return bytecode_interpret(capture_data, capture_stack_data,
+			(struct lttng_interpreter_output *) output);
+}
+
 #undef START_OP
 #undef OP
 #undef PO