Refactoring: struct lttng_event_field

[lttng-ust.git] / liblttng-ust / lttng-bytecode.h

diff --git a/liblttng-ust/lttng-bytecode.h b/liblttng-ust/lttng-bytecode.h
index bf1f2cac1d996003044e225dd0016352c9f8ba9b..90b4c332d7b6879786db2f7187ffce152ffb37a7 100644 (file)
--- a/liblttng-ust/lttng-bytecode.h
+++ b/liblttng-ust/lttng-bytecode.h
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-events.h>
 #include <ust-context-provider.h>
 #include <stdint.h>
@@ -119,7 +119,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_ust_event_field *field;
        struct {
                size_t len;
                enum object_type type;
@@ -131,7 +131,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_ust_event_field *field;
        bool rev_bo;    /* reverse byte order */
 };
 
@@ -208,7 +208,7 @@ struct load_ptr {
                uint64_t u64;
                double d;
        } u;
-       const struct lttng_event_field *field;
+       const struct lttng_ust_event_field *field;
 };
 
 struct estack_entry {
@@ -314,8 +314,8 @@ struct lttng_interpreter_output {
        } u;
 };
 
-/* Should be hidden but would break the ABI */
-const char *print_op(enum bytecode_op op);
+LTTNG_HIDDEN
+const char *lttng_bytecode_print_op(enum bytecode_op op);
 
 LTTNG_HIDDEN
 void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime);
@@ -325,7 +325,7 @@ void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime);
 LTTNG_HIDDEN
 int lttng_bytecode_validate(struct bytecode_runtime *bytecode);
 LTTNG_HIDDEN
-int lttng_bytecode_specialize(const struct lttng_event_desc *event_desc,
+int lttng_bytecode_specialize(const struct lttng_ust_event_desc *event_desc,
                struct bytecode_runtime *bytecode);
 
 LTTNG_HIDDEN