X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.h;h=90b4c332d7b6879786db2f7187ffce152ffb37a7;hb=49926dbd13cfcb46f6947b7e99bc2999c06dc743;hp=5742f7f5c34eae8cad45294494f73818add7f942;hpb=4d451c15c1e519f108b1b6d01fbda2c6975a2a3b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode.h b/liblttng-ust/lttng-bytecode.h
index 5742f7f5..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>
@@ -112,6 +94,9 @@ enum object_type {
 	OBJECT_TYPE_U32,
 	OBJECT_TYPE_U64,
 
+	OBJECT_TYPE_SIGNED_ENUM,
+	OBJECT_TYPE_UNSIGNED_ENUM,
+
 	OBJECT_TYPE_DOUBLE,
 	OBJECT_TYPE_STRING,
 	OBJECT_TYPE_STRING_SEQUENCE,
@@ -134,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;
@@ -146,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 */
 };
 
@@ -223,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 {
@@ -329,17 +314,34 @@ struct lttng_interpreter_output {
 	} u;
 };
 
-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);
+LTTNG_HIDDEN
+void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime);
 
+LTTNG_HIDDEN
 int lttng_bytecode_validate(struct bytecode_runtime *bytecode);
-int lttng_bytecode_specialize(const struct lttng_event_desc *event_desc,
+LTTNG_HIDDEN
+int lttng_bytecode_specialize(const struct lttng_ust_event_desc *event_desc,
 		struct bytecode_runtime *bytecode);
 
+LTTNG_HIDDEN
 uint64_t lttng_bytecode_filter_interpret_false(void *filter_data,
 		const char *filter_stack_data);
+LTTNG_HIDDEN
 uint64_t lttng_bytecode_filter_interpret(void *filter_data,
 		const char *filter_stack_data);
 
+LTTNG_HIDDEN
+uint64_t lttng_bytecode_capture_interpret_false(void *capture_data,
+		const char *capture_stack_data,
+		struct lttng_interpreter_output *output);
+LTTNG_HIDDEN
+uint64_t lttng_bytecode_capture_interpret(void *capture_data,
+		const char *capture_stack_data,
+		struct lttng_interpreter_output *output);
+
 #endif /* _LTTNG_BYTECODE_H */