X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter.h;h=e425b4a535426a398f809d7cd5742931a357ec6a;hb=47e5f13e885764eecde371627001d26da2a2f41f;hp=10832ceab0301f5bb4c3e4dda100129600faed96;hpb=7e50015d099795fcce0602bdb670fd6ae0510026;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.h b/liblttng-ust/lttng-filter.h
index 10832cea..e425b4a5 100644
--- a/liblttng-ust/lttng-filter.h
+++ b/liblttng-ust/lttng-filter.h
@@ -45,6 +45,8 @@
 #define FILTER_STACK_LEN	10	/* includes 2 dummy */
 #define FILTER_STACK_EMPTY	1
 
+#define FILTER_MAX_DATA_LEN	65536
+
 #ifndef min_t
 #define min_t(type, a, b)	\
 		((type) (a) < (type) (b) ? (type) (a) : (type) (b))
@@ -75,20 +77,73 @@ do {								\
 /* Linked bytecode. Child of struct lttng_bytecode_runtime. */
 struct bytecode_runtime {
 	struct lttng_bytecode_runtime p;
+	size_t data_len;
+	size_t data_alloc_len;
+	char *data;
 	uint16_t len;
-	char data[0];
+	char code[0];
 };
 
 enum entry_type {
 	REG_S64,
 	REG_DOUBLE,
 	REG_STRING,
+	REG_STAR_GLOB_STRING,
 	REG_UNKNOWN,
+	REG_PTR,
+};
+
+enum load_type {
+	LOAD_ROOT_CONTEXT,
+	LOAD_ROOT_APP_CONTEXT,
+	LOAD_ROOT_PAYLOAD,
+	LOAD_OBJECT,
+};
+
+enum object_type {
+	OBJECT_TYPE_S8,
+	OBJECT_TYPE_S16,
+	OBJECT_TYPE_S32,
+	OBJECT_TYPE_S64,
+	OBJECT_TYPE_U8,
+	OBJECT_TYPE_U16,
+	OBJECT_TYPE_U32,
+	OBJECT_TYPE_U64,
+
+	OBJECT_TYPE_DOUBLE,
+	OBJECT_TYPE_STRING,
+	OBJECT_TYPE_STRING_SEQUENCE,
+
+	OBJECT_TYPE_SEQUENCE,
+	OBJECT_TYPE_ARRAY,
+	OBJECT_TYPE_STRUCT,
+	OBJECT_TYPE_VARIANT,
+
+	OBJECT_TYPE_DYNAMIC,
+};
+
+struct filter_get_index_data {
+	uint64_t offset;	/* in bytes */
+	size_t ctx_index;
+	size_t array_len;
+	struct {
+		size_t len;
+		enum object_type type;
+		bool rev_bo;	/* reverse byte order */
+	} elem;
 };
 
 /* Validation stack */
+struct vstack_load {
+	enum load_type type;
+	enum object_type object_type;
+	const struct lttng_event_field *field;
+	bool rev_bo;	/* reverse byte order */
+};
+
 struct vstack_entry {
 	enum entry_type type;
+	struct vstack_load load;
 };
 
 struct vstack {
@@ -141,6 +196,30 @@ int vstack_pop(struct vstack *stack)
 }
 
 /* Execution stack */
+enum estack_string_literal_type {
+	ESTACK_STRING_LITERAL_TYPE_NONE,
+	ESTACK_STRING_LITERAL_TYPE_PLAIN,
+	ESTACK_STRING_LITERAL_TYPE_STAR_GLOB,
+};
+
+struct load_ptr {
+	enum load_type type;
+	enum object_type object_type;
+	const void *ptr;
+	bool rev_bo;
+	/* Temporary place-holders for contexts. */
+	union {
+		int64_t s64;
+		uint64_t u64;
+		double d;
+	} u;
+	/*
+	 * "field" is only needed when nested under a variant, in which
+	 * case we cannot specialize the nested operations.
+	 */
+	const struct lttng_event_field *field;
+};
+
 struct estack_entry {
 	enum entry_type type;	/* For dynamic typing. */
 	union {
@@ -150,8 +229,9 @@ struct estack_entry {
 		struct {
 			const char *str;
 			size_t seq_len;
-			int literal;		/* is string literal ? */
+			enum estack_string_literal_type literal_type;
 		} s;
+		struct load_ptr ptr;
 	} u;
 };
 
@@ -210,7 +290,8 @@ struct estack {
 const char *print_op(enum filter_op op);
 
 int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode);
-int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode);
+int lttng_filter_specialize_bytecode(struct lttng_event *event,
+		struct bytecode_runtime *bytecode);
 
 uint64_t lttng_filter_false(void *filter_data,
 		const char *filter_stack_data);