X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-bytecode-interpreter.c;h=0afa8ae69237703c071e5cedf7f13ae70b4f66a3;hb=baa8acf3af23bc5d9373144bef8147744b5ae01f;hp=cb128a692adda5de9901429964c2bdf96d535bc8;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-bytecode-interpreter.c b/src/lib/lttng-ust/lttng-bytecode-interpreter.c
index cb128a69..0afa8ae6 100644
--- a/src/lib/lttng-ust/lttng-bytecode-interpreter.c
+++ b/src/lib/lttng-ust/lttng-bytecode-interpreter.c
@@ -14,10 +14,10 @@
 #include <urcu/rculist.h>
 #include <lttng/ust-endian.h>
 #include <lttng/ust-events.h>
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/events.h"
 
 #include "lttng-bytecode.h"
-#include "string-utils.h"
+#include "common/strutils.h"
 
 
 /*
@@ -457,7 +457,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field s16\n");
 		tmp = *(int16_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_16(tmp);
+			tmp = lttng_ust_bswap_16(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_S64;
 		break;
@@ -469,7 +469,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field s32\n");
 		tmp = *(int32_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_32(tmp);
+			tmp = lttng_ust_bswap_32(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_S64;
 		break;
@@ -481,7 +481,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field s64\n");
 		tmp = *(int64_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_64(tmp);
+			tmp = lttng_ust_bswap_64(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_S64;
 		break;
@@ -493,7 +493,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field signed enumeration\n");
 		tmp = *(int64_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_64(tmp);
+			tmp = lttng_ust_bswap_64(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_S64;
 		break;
@@ -510,7 +510,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field u16\n");
 		tmp = *(uint16_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_16(tmp);
+			tmp = lttng_ust_bswap_16(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_U64;
 		break;
@@ -522,7 +522,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field u32\n");
 		tmp = *(uint32_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_32(tmp);
+			tmp = lttng_ust_bswap_32(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_U64;
 		break;
@@ -534,7 +534,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field u64\n");
 		tmp = *(uint64_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_64(tmp);
+			tmp = lttng_ust_bswap_64(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_U64;
 		break;
@@ -546,7 +546,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		dbg_printf("op load field unsigned enumeration\n");
 		tmp = *(uint64_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
-			tmp = bswap_64(tmp);
+			tmp = lttng_ust_bswap_64(tmp);
 		stack_top->u.v = tmp;
 		stack_top->type = REG_U64;
 		break;
@@ -2511,7 +2511,7 @@ end:
 /*
  * Return LTTNG_UST_EVENT_FILTER_ACCEPT or LTTNG_UST_EVENT_FILTER_REJECT.
  */
-int lttng_ust_interpret_event_filter(struct lttng_ust_event_common *event,
+int lttng_ust_interpret_event_filter(const struct lttng_ust_event_common *event,
 		const char *interpreter_stack_data,
 		void *event_filter_ctx __attribute__((unused)))
 {