projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Filter: specialize comparators
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
filter-bytecode.h
diff --git
a/src/lib/lttng-ctl/filter-bytecode.h
b/src/lib/lttng-ctl/filter-bytecode.h
index fc2d6c8d4c5cf78f8e9965673040b112c6d5bbc8..cdef382f60fd75430d2283dc8ee37602503efbb0 100644
(file)
--- a/
src/lib/lttng-ctl/filter-bytecode.h
+++ b/
src/lib/lttng-ctl/filter-bytecode.h
@@
-23,6
+23,7
@@
*/
#include "filter-ast.h"
*/
#include "filter-ast.h"
+#include "../../common/sessiond-comm/sessiond-comm.h"
/*
* offsets are absolute from start of bytecode.
/*
* offsets are absolute from start of bytecode.
@@
-34,23
+35,19
@@
enum filter_register {
REG_ERROR,
};
REG_ERROR,
};
-enum field_ref_type {
- FIELD_REF_UNKNOWN = 0,
- FIELD_REF_STRING,
- FIELD_REF_SEQUENCE,
- FIELD_REF_S64,
-};
-
struct field_ref {
/* Initially, symbol offset. After link, field offset. */
uint16_t offset;
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 {
int64_t v;
} __attribute__((packed));
} __attribute__((packed));
struct literal_numeric {
int64_t v;
} __attribute__((packed));
+struct literal_double {
+ double v;
+} __attribute__((packed));
+
struct literal_string {
char string[0];
} __attribute__((packed));
struct literal_string {
char string[0];
} __attribute__((packed));
@@
-71,6
+68,8
@@
enum filter_op {
FILTER_OP_BIN_AND,
FILTER_OP_BIN_OR,
FILTER_OP_BIN_XOR,
FILTER_OP_BIN_AND,
FILTER_OP_BIN_OR,
FILTER_OP_BIN_XOR,
+
+ /* binary comparators */
FILTER_OP_EQ,
FILTER_OP_NE,
FILTER_OP_GT,
FILTER_OP_EQ,
FILTER_OP_NE,
FILTER_OP_GT,
@@
-78,10
+77,40
@@
enum filter_op {
FILTER_OP_GE,
FILTER_OP_LE,
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,
/* 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,
/* logical */
FILTER_OP_AND,
@@
-89,8
+118,14
@@
enum filter_op {
/* load */
FILTER_OP_LOAD_FIELD_REF,
/* 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_STRING,
FILTER_OP_LOAD_S64,
+ FILTER_OP_LOAD_DOUBLE,
NR_FILTER_OPS,
};
NR_FILTER_OPS,
};
@@
-123,24
+158,13
@@
struct return_op {
filter_opcode_t op;
} __attribute__((packed));
filter_opcode_t op;
} __attribute__((packed));
-/*
- * The reloc table is located at the end of the bytecode. It is made of
- * tuples: (uint16_t, var. len. string). It starts at
- * reloc_table_offset.
- */
-struct filter_bytecode {
- uint16_t len;
- uint16_t reloc_table_offset;
- char data[0];
-};
-
-struct filter_bytecode_alloc {
+struct lttng_filter_bytecode_alloc {
uint16_t alloc_len;
uint16_t alloc_len;
- struct filter_bytecode b;
+ struct
lttng_
filter_bytecode b;
};
static inline
};
static inline
-unsigned int bytecode_get_len(struct filter_bytecode *bytecode)
+unsigned int bytecode_get_len(struct
lttng_
filter_bytecode *bytecode)
{
return bytecode->len;
}
{
return bytecode->len;
}
This page took
0.037928 seconds
and
4
git commands to generate.