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 5d22cca1c7e9d64a197667491ec5bf6d6611f317..fdc8ac67ed1ada4b72996240de380bf1e6bb3ebb 100644 (file)
--- a/liblttng-ust/lttng-filter.h
+++ b/liblttng-ust/lttng-filter.h
@@ -37,7 +37,8 @@
 #include "filter-bytecode.h"
 
 /* Filter stack length, in number of entries */
-#define FILTER_STACK_LEN       8
+#define FILTER_STACK_LEN       10      /* includes 2 dummy */
+#define FILTER_STACK_EMPTY     1
 
 #ifndef min_t
 #define min_t(type, a, b)      \
@@ -53,18 +54,22 @@
 #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];
 };
@@ -132,16 +137,14 @@ int vstack_pop(struct vstack *stack)
 
 /* Execution stack */
 struct estack_entry {
-       enum entry_type type;
-
        union {
                int64_t v;
                double d;
 
                struct {
                        const char *str;
-               size_t seq_len;
-               int literal;            /* is string literal ? */
+                       size_t seq_len;
+                       int literal;            /* is string literal ? */
                } s;
        } u;
 };
@@ -151,48 +154,45 @@ struct estack {
        struct estack_entry e[FILTER_STACK_LEN];
 };
 
-static inline
-void estack_init(struct estack *stack)
-{
-       stack->top = -1;
-}
-
-static inline
-struct estack_entry *estack_ax(struct estack *stack)
-{
-       assert(stack->top >= 0);
-       return &stack->e[stack->top];
-}
-
-static inline
-struct estack_entry *estack_bx(struct estack *stack)
-{
-       assert(stack->top >= 1);
-       return &stack->e[stack->top - 1];
-}
-
-static inline
-void estack_push(struct estack *stack)
-{
-       assert(stack->top < FILTER_STACK_LEN - 1);
-       ++stack->top;
-}
-
-static inline
-void estack_pop(struct estack *stack)
-{
-       assert(stack->top >= 0);
-       stack->top--;
-}
+#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 */