X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.h;h=90b4c332d7b6879786db2f7187ffce152ffb37a7;hb=105cf2ebe3f18f1cb4fc719ee38c05cfbc975248;hp=ad3e3d0e5ffac15fc96c28aa1521cbf6fadd0a24;hpb=11d68c2c7f004e91fe239ca3ffc5c2a1d879403f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.h b/liblttng-ust/lttng-bytecode.h
index ad3e3d0e..90b4c332 100644
--- a/liblttng-ust/lttng-bytecode.h
+++ b/liblttng-ust/lttng-bytecode.h
@@ -1,38 +1,20 @@
-#ifndef _LTTNG_BYTECODE_H
-#define _LTTNG_BYTECODE_H
-
 /*
- * lttng-bytecode.h
- *
- * LTTng UST bytecode header.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * LTTng UST bytecode header.
  */
 
+#ifndef _LTTNG_BYTECODE_H
+#define _LTTNG_BYTECODE_H
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-events.h>
-#include <lttng/ust-context-provider.h>
+#include <ust-context-provider.h>
 #include <stdint.h>
 #include <assert.h>
 #include <errno.h>
@@ -137,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;
@@ -149,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 */
 };
 
@@ -226,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 {
@@ -332,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);
@@ -343,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