X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-filter.h;h=3fba528e25a58a3d5da85aae8ace95342b932345;hb=1804b6153d4cba1bc1152b58497e981a1140caa9;hp=6ce78ac49b2d138e84dcf1f57832caeb29eb8f52;hpb=bbf3aef542f1d86cb2a2a304444ef7529d01eb6b;p=lttng-modules.git

diff --git a/lttng-filter.h b/lttng-filter.h
index 6ce78ac4..3fba528e 100644
--- a/lttng-filter.h
+++ b/lttng-filter.h
@@ -36,6 +36,8 @@
 #define FILTER_STACK_LEN	10	/* includes 2 dummy */
 #define FILTER_STACK_EMPTY	1
 
+#define FILTER_MAX_DATA_LEN	65536
+
 #ifdef DEBUG
 #define dbg_printk(fmt, args...)				\
 	printk(KERN_DEBUG "[debug bytecode in %s:%s@%u] " fmt,		\
@@ -53,20 +55,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_TYPE_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 {
@@ -119,6 +174,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 {
 	union {
 		int64_t v;
@@ -127,9 +206,10 @@ struct estack_entry {
 			const char *str;
 			const char __user *user_str;
 			size_t seq_len;
-			int literal;		/* is string literal ? */
+			enum estack_string_literal_type literal_type;
 			int user;		/* is string from userspace ? */
 		} s;
+		struct load_ptr ptr;
 	} u;
 };
 
@@ -172,7 +252,8 @@ struct estack {
 const char *lttng_filter_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,
 		struct lttng_probe_ctx *lttng_probe_ctx,