X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter-bytecode.h;h=a846ec7a72cc30d9213d65139dc70224d3866392;hb=aa449dc58147b75aa0b349aa0eaae92c758db01d;hp=07cf99b2dcd46f8f06423046857dcd193812c117;hpb=e90d856165cc1110ac0d4c657a001c47236d6de8;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/filter-bytecode.h b/src/lib/lttng-ctl/filter-bytecode.h
index 07cf99b2d..a846ec7a7 100644
--- a/src/lib/lttng-ctl/filter-bytecode.h
+++ b/src/lib/lttng-ctl/filter-bytecode.h
@@ -35,18 +35,9 @@ enum filter_register {
 	REG_ERROR,
 };
 
-enum field_ref_type {
-	FIELD_REF_UNKNOWN = 0,
-	FIELD_REF_STRING,
-	FIELD_REF_SEQUENCE,
-	FIELD_REF_S64,
-	FIELD_REF_DOUBLE,
-};
-
 struct field_ref {
 	/* Initially, symbol offset. After link, field offset. */
 	uint16_t offset;
-	uint8_t type;	/* enum field_ref_type */
 } __attribute__((packed));
 
 struct literal_numeric {
@@ -77,6 +68,8 @@ enum filter_op {
 	FILTER_OP_BIN_AND,
 	FILTER_OP_BIN_OR,
 	FILTER_OP_BIN_XOR,
+
+	/* binary comparators */
 	FILTER_OP_EQ,
 	FILTER_OP_NE,
 	FILTER_OP_GT,
@@ -84,17 +77,56 @@ enum filter_op {
 	FILTER_OP_GE,
 	FILTER_OP_LE,
 
+	/* string binary comparator */
+	FILTER_OP_EQ_STRING,
+	FILTER_OP_NE_STRING,
+	FILTER_OP_GT_STRING,
+	FILTER_OP_LT_STRING,
+	FILTER_OP_GE_STRING,
+	FILTER_OP_LE_STRING,
+
+	/* s64 binary comparator */
+	FILTER_OP_EQ_S64,
+	FILTER_OP_NE_S64,
+	FILTER_OP_GT_S64,
+	FILTER_OP_LT_S64,
+	FILTER_OP_GE_S64,
+	FILTER_OP_LE_S64,
+
+	/* double binary comparator */
+	FILTER_OP_EQ_DOUBLE,
+	FILTER_OP_NE_DOUBLE,
+	FILTER_OP_GT_DOUBLE,
+	FILTER_OP_LT_DOUBLE,
+	FILTER_OP_GE_DOUBLE,
+	FILTER_OP_LE_DOUBLE,
+
 	/* unary */
 	FILTER_OP_UNARY_PLUS,
 	FILTER_OP_UNARY_MINUS,
 	FILTER_OP_UNARY_NOT,
+	FILTER_OP_UNARY_PLUS_S64,
+	FILTER_OP_UNARY_MINUS_S64,
+	FILTER_OP_UNARY_NOT_S64,
+	FILTER_OP_UNARY_PLUS_DOUBLE,
+	FILTER_OP_UNARY_MINUS_DOUBLE,
+	FILTER_OP_UNARY_NOT_DOUBLE,
 
 	/* logical */
 	FILTER_OP_AND,
 	FILTER_OP_OR,
+	FILTER_OP_AND_S64,
+	FILTER_OP_OR_S64,
+	FILTER_OP_AND_DOUBLE,
+	FILTER_OP_OR_DOUBLE,
 
 	/* load */
 	FILTER_OP_LOAD_FIELD_REF,
+	FILTER_OP_LOAD_FIELD_REF_STRING,
+	FILTER_OP_LOAD_FIELD_REF_SEQUENCE,
+	FILTER_OP_LOAD_FIELD_REF_S64,
+	FILTER_OP_LOAD_FIELD_REF_DOUBLE,
+
 	FILTER_OP_LOAD_STRING,
 	FILTER_OP_LOAD_S64,
 	FILTER_OP_LOAD_DOUBLE,