Version 2.5.7

[lttng-ust.git] / liblttng-ust / lttng-filter.h

diff --git a/liblttng-ust/lttng-filter.h b/liblttng-ust/lttng-filter.h
index 4ef1c757635eaf5edae394df19511c932b5682b0..fdc8ac67ed1ada4b72996240de380bf1e6bb3ebb 100644 (file)
--- a/liblttng-ust/lttng-filter.h
+++ b/liblttng-ust/lttng-filter.h
@@ -28,6 +28,7 @@
 #include <helper.h>
 #include <lttng/ust-events.h>
 #include <stdint.h>
+#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <inttypes.h>
@@ -35,7 +36,9 @@
 #include <usterr-signal-safe.h>
 #include "filter-bytecode.h"
 
-#define NR_REG         2
+/* Filter stack length, in number of entries */
+#define FILTER_STACK_LEN       10      /* includes 2 dummy */
+#define FILTER_STACK_EMPTY     1
 
 #ifndef min_t
 #define min_t(type, a, b)      \
@@ -51,54 +54,145 @@
 #endif
 
 #ifdef DEBUG
-#define dbg_printf(fmt, args...)     printf("[debug bytecode] " fmt, ## args)
+#define dbg_printf(fmt, args...)                               \
+       printf("[debug bytecode in %s:%s@%u] " fmt,             \
+               __FILE__, __func__, __LINE__, ## args)
 #else
 #define dbg_printf(fmt, args...)                               \
 do {                                                           \
        /* do nothing but check printf format */                \
        if (0)                                                  \
-               printf("[debug bytecode] " fmt, ## args);       \
+               printf("[debug bytecode in %s:%s@%u] " fmt,     \
+                       __FILE__, __func__, __LINE__, ## args); \
 } while (0)
 #endif
 
-/* Linked bytecode */
+/* Linked bytecode. Child of struct lttng_bytecode_runtime. */
 struct bytecode_runtime {
+       struct lttng_bytecode_runtime p;
        uint16_t len;
        char data[0];
 };
 
-enum reg_type {
+enum entry_type {
        REG_S64,
        REG_DOUBLE,
        REG_STRING,
        REG_TYPE_UNKNOWN,
 };
 
-/* Validation registers */
-struct vreg {
-       enum reg_type type;
-       int literal;            /* is string literal ? */
+/* Validation stack */
+struct vstack_entry {
+       enum entry_type type;
 };
 
-/* Execution registers */
-struct reg {
-       enum reg_type type;
-       int64_t v;
-       double d;
+struct vstack {
+       int top;        /* top of stack */
+       struct vstack_entry e[FILTER_STACK_LEN];
+};
 
-       const char *str;
-       size_t seq_len;
-       int literal;            /* is string literal ? */
+static inline
+void vstack_init(struct vstack *stack)
+{
+       stack->top = -1;
+}
+
+static inline
+struct vstack_entry *vstack_ax(struct vstack *stack)
+{
+       if (unlikely(stack->top < 0))
+               return NULL;
+       return &stack->e[stack->top];
+}
+
+static inline
+struct vstack_entry *vstack_bx(struct vstack *stack)
+{
+       if (unlikely(stack->top < 1))
+               return NULL;
+       return &stack->e[stack->top - 1];
+}
+
+static inline
+int vstack_push(struct vstack *stack)
+{
+       if (stack->top >= FILTER_STACK_LEN - 1) {
+               ERR("Stack full\n");
+               return -EINVAL;
+       }
+       ++stack->top;
+       return 0;
+}
+
+static inline
+int vstack_pop(struct vstack *stack)
+{
+       if (unlikely(stack->top < 0)) {
+               ERR("Stack empty\n");
+               return -EINVAL;
+       }
+       stack->top--;
+       return 0;
+}
+
+/* Execution stack */
+struct estack_entry {
+       union {
+               int64_t v;
+               double d;
+
+               struct {
+                       const char *str;
+                       size_t seq_len;
+                       int literal;            /* is string literal ? */
+               } s;
+       } u;
 };
 
+struct estack {
+       int top;        /* top of stack */
+       struct estack_entry e[FILTER_STACK_LEN];
+};
+
+#define estack_ax_v    ax
+#define estack_bx_v    bx
+
+#define estack_ax(stack, top)                                  \
+       ({                                                      \
+               assert((top) > FILTER_STACK_EMPTY);             \
+               &(stack)->e[top];                               \
+       })
+
+#define estack_bx(stack, top)                                  \
+       ({                                                      \
+               assert((top) > FILTER_STACK_EMPTY + 1);         \
+               &(stack)->e[(top) - 1];                         \
+       })
+
+#define estack_push(stack, top, ax, bx)                                \
+       do {                                                    \
+               assert((top) < FILTER_STACK_LEN - 1);           \
+               (stack)->e[(top) - 1].u.v = (bx);               \
+               (bx) = (ax);                                    \
+               ++(top);                                        \
+       } while (0)
+
+#define estack_pop(stack, top, ax, bx)                         \
+       do {                                                    \
+               assert((top) > FILTER_STACK_EMPTY);             \
+               (ax) = (bx);                                    \
+               (bx) = (stack)->e[(top) - 2].u.v;               \
+               (top)--;                                        \
+       } while (0)
+
 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_false(void *filter_data,
+uint64_t lttng_filter_false(void *filter_data,
                const char *filter_stack_data);
-int lttng_filter_interpret_bytecode(void *filter_data,
+uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                const char *filter_stack_data);
 
 #endif /* _LTTNG_FILTER_H */