Cleanup: remove unused `lttng_free_enabler_filter_bytecode()` func
[lttng-ust.git] / liblttng-ust / lttng-filter.c
index 6d64924b94a6683e665d30cc265d9e09c240dd3d..ee562dd0f6a61a1193989ba7e27cf4cf046047cb 100644 (file)
@@ -3,90 +3,34 @@
  *
  * LTTng UST filter code.
  *
- * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
-#include <errno.h>
-#include <stdio.h>
-#include <helper.h>
-#include <lttng/ust-events.h>
+#define _LGPL_SOURCE
+#include <stddef.h>
 #include <stdint.h>
-#include <errno.h>
-#include <string.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <usterr-signal-safe.h>
-#include "filter-bytecode.h"
 
-#define NR_REG         2
+#include <urcu/rculist.h>
 
-#ifndef min_t
-#define min_t(type, a, b)      \
-               ((type) (a) < (type) (b) ? (type) (a) : (type) (b))
-#endif
-
-#ifndef likely
-#define likely(x)      __builtin_expect(!!(x), 1)
-#endif
-
-#ifndef unlikely
-#define unlikely(x)    __builtin_expect(!!(x), 0)
-#endif
-
-#ifdef DEBUG
-#define dbg_printf(fmt, args...)     printf("[debug bytecode] " fmt, ## args)
-#else
-#define dbg_printf(fmt, args...)                               \
-do {                                                           \
-       /* do nothing but check printf format */                \
-       if (0)                                                  \
-               printf("[debug bytecode] " fmt, ## args);       \
-} while (0)
-#endif
-
-/* Linked bytecode */
-struct bytecode_runtime {
-       uint16_t len;
-       char data[0];
-};
-
-enum reg_type {
-       REG_S64,
-       REG_DOUBLE,
-       REG_STRING,
-       REG_TYPE_UNKNOWN,
-};
-
-/* Validation registers */
-struct vreg {
-       enum reg_type type;
-       int literal;            /* is string literal ? */
-};
-
-/* Execution registers */
-struct reg {
-       enum reg_type type;
-       int64_t v;
-       double d;
-
-       const char *str;
-       size_t seq_len;
-       int literal;            /* is string literal ? */
-};
+#include "lttng-filter.h"
 
 static const char *opnames[] = {
        [ FILTER_OP_UNKNOWN ] = "UNKNOWN",
@@ -99,11 +43,13 @@ static const char *opnames[] = {
        [ FILTER_OP_MOD ] = "MOD",
        [ FILTER_OP_PLUS ] = "PLUS",
        [ FILTER_OP_MINUS ] = "MINUS",
-       [ FILTER_OP_RSHIFT ] = "RSHIFT",
-       [ FILTER_OP_LSHIFT ] = "LSHIFT",
-       [ FILTER_OP_BIN_AND ] = "BIN_AND",
-       [ FILTER_OP_BIN_OR ] = "BIN_OR",
-       [ FILTER_OP_BIN_XOR ] = "BIN_XOR",
+       [ FILTER_OP_BIT_RSHIFT ] = "BIT_RSHIFT",
+       [ FILTER_OP_BIT_LSHIFT ] = "BIT_LSHIFT",
+       [ FILTER_OP_BIT_AND ] = "BIT_AND",
+       [ FILTER_OP_BIT_OR ] = "BIT_OR",
+       [ FILTER_OP_BIT_XOR ] = "BIT_XOR",
+
+       /* binary comparators */
        [ FILTER_OP_EQ ] = "EQ",
        [ FILTER_OP_NE ] = "NE",
        [ FILTER_OP_GT ] = "GT",
@@ -111,1061 +57,354 @@ static const char *opnames[] = {
        [ FILTER_OP_GE ] = "GE",
        [ FILTER_OP_LE ] = "LE",
 
+       /* string binary comparators */
+       [ FILTER_OP_EQ_STRING ] = "EQ_STRING",
+       [ FILTER_OP_NE_STRING ] = "NE_STRING",
+       [ FILTER_OP_GT_STRING ] = "GT_STRING",
+       [ FILTER_OP_LT_STRING ] = "LT_STRING",
+       [ FILTER_OP_GE_STRING ] = "GE_STRING",
+       [ FILTER_OP_LE_STRING ] = "LE_STRING",
+
+       /* s64 binary comparators */
+       [ FILTER_OP_EQ_S64 ] = "EQ_S64",
+       [ FILTER_OP_NE_S64 ] = "NE_S64",
+       [ FILTER_OP_GT_S64 ] = "GT_S64",
+       [ FILTER_OP_LT_S64 ] = "LT_S64",
+       [ FILTER_OP_GE_S64 ] = "GE_S64",
+       [ FILTER_OP_LE_S64 ] = "LE_S64",
+
+       /* double binary comparators */
+       [ FILTER_OP_EQ_DOUBLE ] = "EQ_DOUBLE",
+       [ FILTER_OP_NE_DOUBLE ] = "NE_DOUBLE",
+       [ FILTER_OP_GT_DOUBLE ] = "GT_DOUBLE",
+       [ FILTER_OP_LT_DOUBLE ] = "LT_DOUBLE",
+       [ FILTER_OP_GE_DOUBLE ] = "GE_DOUBLE",
+       [ FILTER_OP_LE_DOUBLE ] = "LE_DOUBLE",
+
+       /* Mixed S64-double binary comparators */
+       [ FILTER_OP_EQ_DOUBLE_S64 ] = "EQ_DOUBLE_S64",
+       [ FILTER_OP_NE_DOUBLE_S64 ] = "NE_DOUBLE_S64",
+       [ FILTER_OP_GT_DOUBLE_S64 ] = "GT_DOUBLE_S64",
+       [ FILTER_OP_LT_DOUBLE_S64 ] = "LT_DOUBLE_S64",
+       [ FILTER_OP_GE_DOUBLE_S64 ] = "GE_DOUBLE_S64",
+       [ FILTER_OP_LE_DOUBLE_S64 ] = "LE_DOUBLE_S64",
+
+       [ FILTER_OP_EQ_S64_DOUBLE ] = "EQ_S64_DOUBLE",
+       [ FILTER_OP_NE_S64_DOUBLE ] = "NE_S64_DOUBLE",
+       [ FILTER_OP_GT_S64_DOUBLE ] = "GT_S64_DOUBLE",
+       [ FILTER_OP_LT_S64_DOUBLE ] = "LT_S64_DOUBLE",
+       [ FILTER_OP_GE_S64_DOUBLE ] = "GE_S64_DOUBLE",
+       [ FILTER_OP_LE_S64_DOUBLE ] = "LE_S64_DOUBLE",
+
        /* unary */
        [ FILTER_OP_UNARY_PLUS ] = "UNARY_PLUS",
        [ FILTER_OP_UNARY_MINUS ] = "UNARY_MINUS",
        [ FILTER_OP_UNARY_NOT ] = "UNARY_NOT",
+       [ FILTER_OP_UNARY_PLUS_S64 ] = "UNARY_PLUS_S64",
+       [ FILTER_OP_UNARY_MINUS_S64 ] = "UNARY_MINUS_S64",
+       [ FILTER_OP_UNARY_NOT_S64 ] = "UNARY_NOT_S64",
+       [ FILTER_OP_UNARY_PLUS_DOUBLE ] = "UNARY_PLUS_DOUBLE",
+       [ FILTER_OP_UNARY_MINUS_DOUBLE ] = "UNARY_MINUS_DOUBLE",
+       [ FILTER_OP_UNARY_NOT_DOUBLE ] = "UNARY_NOT_DOUBLE",
 
        /* logical */
        [ FILTER_OP_AND ] = "AND",
        [ FILTER_OP_OR ] = "OR",
 
-       /* load */
+       /* load field ref */
        [ FILTER_OP_LOAD_FIELD_REF ] = "LOAD_FIELD_REF",
        [ FILTER_OP_LOAD_FIELD_REF_STRING ] = "LOAD_FIELD_REF_STRING",
        [ FILTER_OP_LOAD_FIELD_REF_SEQUENCE ] = "LOAD_FIELD_REF_SEQUENCE",
        [ FILTER_OP_LOAD_FIELD_REF_S64 ] = "LOAD_FIELD_REF_S64",
        [ FILTER_OP_LOAD_FIELD_REF_DOUBLE ] = "LOAD_FIELD_REF_DOUBLE",
 
+       /* load from immediate operand */
        [ FILTER_OP_LOAD_STRING ] = "LOAD_STRING",
        [ FILTER_OP_LOAD_S64 ] = "LOAD_S64",
        [ FILTER_OP_LOAD_DOUBLE ] = "LOAD_DOUBLE",
-};
 
-static
-const char *print_op(enum filter_op op)
-{
-       if (op >= NR_FILTER_OPS)
-               return "UNKNOWN";
-       else
-               return opnames[op];
-}
+       /* cast */
+       [ FILTER_OP_CAST_TO_S64 ] = "CAST_TO_S64",
+       [ FILTER_OP_CAST_DOUBLE_TO_S64 ] = "CAST_DOUBLE_TO_S64",
+       [ FILTER_OP_CAST_NOP ] = "CAST_NOP",
 
-/*
- * -1: wildcard found.
- * -2: unknown escape char.
- * 0: normal char.
- */
+       /* get context ref */
+       [ FILTER_OP_GET_CONTEXT_REF ] = "GET_CONTEXT_REF",
+       [ FILTER_OP_GET_CONTEXT_REF_STRING ] = "GET_CONTEXT_REF_STRING",
+       [ FILTER_OP_GET_CONTEXT_REF_S64 ] = "GET_CONTEXT_REF_S64",
+       [ FILTER_OP_GET_CONTEXT_REF_DOUBLE ] = "GET_CONTEXT_REF_DOUBLE",
 
-static
-int parse_char(const char **p)
-{
-       switch (**p) {
-       case '\\':
-               (*p)++;
-               switch (**p) {
-               case '\\':
-               case '*':
-                       return 0;
-               default:
-                       return -2;
-               }
-       case '*':
-               return -1;
-       default:
-               return 0;
-       }
-}
+       /* load userspace field ref */
+       [ FILTER_OP_LOAD_FIELD_REF_USER_STRING ] = "LOAD_FIELD_REF_USER_STRING",
+       [ FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE ] = "LOAD_FIELD_REF_USER_SEQUENCE",
 
-static
-int reg_strcmp(struct reg reg[NR_REG], const char *cmp_type)
-{
-       const char *p = reg[REG_R0].str, *q = reg[REG_R1].str;
-       int ret;
-       int diff;
+       /*
+        * load immediate star globbing pattern (literal string)
+        * from immediate.
+        */
+       [ FILTER_OP_LOAD_STAR_GLOB_STRING ] = "LOAD_STAR_GLOB_STRING",
 
-       for (;;) {
-               int escaped_r0 = 0;
+       /* globbing pattern binary operator: apply to */
+       [ FILTER_OP_EQ_STAR_GLOB_STRING ] = "EQ_STAR_GLOB_STRING",
+       [ FILTER_OP_NE_STAR_GLOB_STRING ] = "NE_STAR_GLOB_STRING",
 
-               if (unlikely(p - reg[REG_R0].str > reg[REG_R0].seq_len || *p == '\0')) {
-                       if (q - reg[REG_R1].str > reg[REG_R1].seq_len || *q == '\0')
-                               diff = 0;
-                       else
-                               diff = -1;
-                       break;
-               }
-               if (unlikely(q - reg[REG_R1].str > reg[REG_R1].seq_len || *q == '\0')) {
-                       if (p - reg[REG_R0].str > reg[REG_R0].seq_len || *p == '\0')
-                               diff = 0;
-                       else
-                               diff = 1;
-                       break;
-               }
-               if (reg[REG_R0].literal) {
-                       ret = parse_char(&p);
-                       if (ret == -1) {
-                               return 0;
-                       } else if (ret == -2) {
-                               escaped_r0 = 1;
-                       }
-                       /* else compare both char */
-               }
-               if (reg[REG_R1].literal) {
-                       ret = parse_char(&q);
-                       if (ret == -1) {
-                               return 0;
-                       } else if (ret == -2) {
-                               if (!escaped_r0)
-                                       return -1;
-                       } else {
-                               if (escaped_r0)
-                                       return 1;
-                       }
-               } else {
-                       if (escaped_r0)
-                               return 1;
-               }
-               diff = *p - *q;
-               if (diff != 0)
-                       break;
-               p++;
-               q++;
-       }
-       return diff;
-}
+       /*
+        * Instructions for recursive traversal through composed types.
+        */
+       [ FILTER_OP_GET_CONTEXT_ROOT ] = "GET_CONTEXT_ROOT",
+       [ FILTER_OP_GET_APP_CONTEXT_ROOT ] = "GET_APP_CONTEXT_ROOT",
+       [ FILTER_OP_GET_PAYLOAD_ROOT ] = "GET_PAYLOAD_ROOT",
+
+       [ FILTER_OP_GET_SYMBOL ] = "GET_SYMBOL",
+       [ FILTER_OP_GET_SYMBOL_FIELD ] = "GET_SYMBOL_FIELD",
+       [ FILTER_OP_GET_INDEX_U16 ] = "GET_INDEX_U16",
+       [ FILTER_OP_GET_INDEX_U64 ] = "GET_INDEX_U64",
+
+       [ FILTER_OP_LOAD_FIELD ] = "LOAD_FIELD",
+       [ FILTER_OP_LOAD_FIELD_S8 ] = "LOAD_FIELD_S8",
+       [ FILTER_OP_LOAD_FIELD_S16 ] = "LOAD_FIELD_S16",
+       [ FILTER_OP_LOAD_FIELD_S32 ] = "LOAD_FIELD_S32",
+       [ FILTER_OP_LOAD_FIELD_S64 ] = "LOAD_FIELD_S64",
+       [ FILTER_OP_LOAD_FIELD_U8 ] = "LOAD_FIELD_U8",
+       [ FILTER_OP_LOAD_FIELD_U16 ] = "LOAD_FIELD_U16",
+       [ FILTER_OP_LOAD_FIELD_U32 ] = "LOAD_FIELD_U32",
+       [ FILTER_OP_LOAD_FIELD_U64 ] = "LOAD_FIELD_U64",
+       [ FILTER_OP_LOAD_FIELD_STRING ] = "LOAD_FIELD_STRING",
+       [ FILTER_OP_LOAD_FIELD_SEQUENCE ] = "LOAD_FIELD_SEQUENCE",
+       [ FILTER_OP_LOAD_FIELD_DOUBLE ] = "LOAD_FIELD_DOUBLE",
+
+       [ FILTER_OP_UNARY_BIT_NOT ] = "UNARY_BIT_NOT",
+
+       [ FILTER_OP_RETURN_S64 ] = "RETURN_S64",
+};
 
-static
-int lttng_filter_false(void *filter_data,
-               const char *filter_stack_data)
+const char *print_op(enum filter_op op)
 {
-       return 0;
+       if (op >= NR_FILTER_OPS)
+               return "UNKNOWN";
+       else
+               return opnames[op];
 }
 
 static
-int lttng_filter_interpret_bytecode(void *filter_data,
-               const char *filter_stack_data)
+int apply_field_reloc(struct lttng_event *event,
+               struct bytecode_runtime *runtime,
+               uint32_t runtime_len,
+               uint32_t reloc_offset,
+               const char *field_name,
+               enum filter_op filter_op)
 {
-       struct bytecode_runtime *bytecode = filter_data;
-       void *pc, *next_pc, *start_pc;
-       int ret = -EINVAL;
-       int retval = 0;
-       struct reg reg[NR_REG];
-
-       start_pc = &bytecode->data[0];
-       for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
-                       pc = next_pc) {
-               dbg_printf("Executing op %s (%u)\n",
-                       print_op((unsigned int) *(filter_opcode_t *) pc),
-                       (unsigned int) *(filter_opcode_t *) pc);
-               switch (*(filter_opcode_t *) pc) {
-               case FILTER_OP_UNKNOWN:
-               case FILTER_OP_LOAD_FIELD_REF:
-               default:
-                       ERR("unknown bytecode op %u\n",
-                               (unsigned int) *(filter_opcode_t *) pc);
-                       ret = -EINVAL;
-                       goto end;
-
-               case FILTER_OP_RETURN:
-                       retval = !!reg[0].v;
-                       ret = 0;
-                       goto end;
-
-               /* binary */
-               case FILTER_OP_MUL:
-               case FILTER_OP_DIV:
-               case FILTER_OP_MOD:
-               case FILTER_OP_PLUS:
-               case FILTER_OP_MINUS:
-               case FILTER_OP_RSHIFT:
-               case FILTER_OP_LSHIFT:
-               case FILTER_OP_BIN_AND:
-               case FILTER_OP_BIN_OR:
-               case FILTER_OP_BIN_XOR:
-                       ERR("unsupported bytecode op %u\n",
-                               (unsigned int) *(filter_opcode_t *) pc);
-                       ret = -EINVAL;
-                       goto end;
-
-               case FILTER_OP_EQ:
-               {
-                       switch (reg[REG_R0].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               reg[REG_R0].v = (reg_strcmp(reg, "==") == 0);
-                               break;
-                       case REG_S64:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].v == reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].v == reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       case REG_DOUBLE:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].d == reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].d == reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       }
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_NE:
-               {
-                       switch (reg[REG_R0].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               reg[REG_R0].v = (reg_strcmp(reg, "!=") != 0);
-                               break;
-                       case REG_S64:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].v != reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].v != reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       case REG_DOUBLE:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].d != reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].d != reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       }
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_GT:
-               {
-                       switch (reg[REG_R0].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               reg[REG_R0].v = (reg_strcmp(reg, ">") > 0);
-                               break;
-                       case REG_S64:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].v > reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].v > reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       case REG_DOUBLE:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].d > reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].d > reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       }
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_LT:
-               {
-                       switch (reg[REG_R0].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               reg[REG_R0].v = (reg_strcmp(reg, "<") < 0);
-                               break;
-                       case REG_S64:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].v < reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].v < reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       case REG_DOUBLE:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].d < reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].d < reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       }
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_GE:
-               {
-                       switch (reg[REG_R0].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               reg[REG_R0].v = (reg_strcmp(reg, ">=") >= 0);
-                               break;
-                       case REG_S64:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].v >= reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].v >= reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       case REG_DOUBLE:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].d >= reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].d >= reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       }
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_LE:
-               {
-                       switch (reg[REG_R0].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               reg[REG_R0].v = (reg_strcmp(reg, "<=") <= 0);
-                               break;
-                       case REG_S64:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].v <= reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].v <= reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       case REG_DOUBLE:
-                               switch (reg[REG_R1].type) {
-                               default:
-                                       ERR("unknown register type\n");
-                                       ret = -EINVAL;
-                                       goto end;
-
-                               case REG_S64:
-                                       reg[REG_R0].v = (reg[REG_R0].d <= reg[REG_R1].v);
-                                       break;
-                               case REG_DOUBLE:
-                                       reg[REG_R0].v = (reg[REG_R0].d <= reg[REG_R1].d);
-                                       break;
-                               }
-                               break;
-                       }
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-
-               /* unary */
-               case FILTER_OP_UNARY_PLUS:
-               {
-                       next_pc += sizeof(struct unary_op);
-                       break;
-               }
-               case FILTER_OP_UNARY_MINUS:
-               {
-                       struct unary_op *insn = (struct unary_op *) pc;
-
-                       switch (reg[insn->reg].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               ERR("Unary minus can only be applied to numeric or floating point registers\n");
-                               ret = -EINVAL;
-                               goto end;
-                       case REG_S64:
-                               reg[insn->reg].v = -reg[insn->reg].v;
-                               break;
-                       case REG_DOUBLE:
-                               reg[insn->reg].d = -reg[insn->reg].d;
-                               break;
-                       }
-                       next_pc += sizeof(struct unary_op);
-                       break;
-               }
-               case FILTER_OP_UNARY_NOT:
-               {
-                       struct unary_op *insn = (struct unary_op *) pc;
-
-                       switch (reg[insn->reg].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
+       const struct lttng_event_desc *desc;
+       const struct lttng_event_field *fields, *field = NULL;
+       unsigned int nr_fields, i;
+       struct load_op *op;
+       uint32_t field_offset = 0;
 
-                       case REG_STRING:
-                               ERR("Unary not can only be applied to numeric or floating point registers\n");
-                               ret = -EINVAL;
-                               goto end;
-                       case REG_S64:
-                               reg[insn->reg].v = !reg[insn->reg].v;
-                               break;
-                       case REG_DOUBLE:
-                               reg[insn->reg].d = !reg[insn->reg].d;
-                               break;
-                       }
-                       reg[insn->reg].v = !reg[insn->reg].v;
-                       next_pc += sizeof(struct unary_op);
-                       break;
-               }
-               /* logical */
-               case FILTER_OP_AND:
-               {
-                       struct logical_op *insn = (struct logical_op *) pc;
+       dbg_printf("Apply field reloc: %u %s\n", reloc_offset, field_name);
 
-                       /* If REG_R0 is 0, skip and evaluate to 0 */
-                       if ((reg[REG_R0].type == REG_S64 && reg[REG_R0].v == 0)
-                                       || (reg[REG_R0].type == REG_DOUBLE && reg[REG_R0].d == 0.0)) {
-                               dbg_printf("Jumping to bytecode offset %u\n",
-                                       (unsigned int) insn->skip_offset);
-                               next_pc = start_pc + insn->skip_offset;
-                       } else {
-                               next_pc += sizeof(struct logical_op);
-                       }
+       /* Lookup event by name */
+       desc = event->desc;
+       if (!desc)
+               return -EINVAL;
+       fields = desc->fields;
+       if (!fields)
+               return -EINVAL;
+       nr_fields = desc->nr_fields;
+       for (i = 0; i < nr_fields; i++) {
+               if (!strcmp(fields[i].name, field_name)) {
+                       field = &fields[i];
                        break;
                }
-               case FILTER_OP_OR:
-               {
-                       struct logical_op *insn = (struct logical_op *) pc;
-
-                       /* If REG_R0 is nonzero, skip and evaluate to 1 */
-
-                       if ((reg[REG_R0].type == REG_S64 && reg[REG_R0].v != 0)
-                                       || (reg[REG_R0].type == REG_DOUBLE && reg[REG_R0].d != 0.0)) {
-                               reg[REG_R0].v = 1;
-                               dbg_printf("Jumping to bytecode offset %u\n",
-                                       (unsigned int) insn->skip_offset);
-                               next_pc = start_pc + insn->skip_offset;
-                       } else {
-                               next_pc += sizeof(struct logical_op);
-                       }
+               /* compute field offset */
+               switch (fields[i].type.atype) {
+               case atype_integer:
+               case atype_enum:
+                       field_offset += sizeof(int64_t);
                        break;
-               }
-
-               /* load */
-               case FILTER_OP_LOAD_FIELD_REF_STRING:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
-
-                       dbg_printf("load field ref offset %u type string\n",
-                               ref->offset);
-                       reg[insn->reg].str =
-                               *(const char * const *) &filter_stack_data[ref->offset];
-                       reg[insn->reg].type = REG_STRING;
-                       reg[insn->reg].seq_len = UINT_MAX;
-                       reg[insn->reg].literal = 0;
-                       dbg_printf("ref load string %s\n", reg[insn->reg].str);
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+               case atype_array:
+               case atype_sequence:
+                       field_offset += sizeof(unsigned long);
+                       field_offset += sizeof(void *);
                        break;
-               }
-
-               case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
-
-                       dbg_printf("load field ref offset %u type sequence\n",
-                               ref->offset);
-                       reg[insn->reg].seq_len =
-                               *(unsigned long *) &filter_stack_data[ref->offset];
-                       reg[insn->reg].str =
-                               *(const char **) (&filter_stack_data[ref->offset
-                                                               + sizeof(unsigned long)]);
-                       reg[insn->reg].type = REG_STRING;
-                       reg[insn->reg].literal = 0;
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+               case atype_string:
+                       field_offset += sizeof(void *);
                        break;
-               }
-
-               case FILTER_OP_LOAD_FIELD_REF_S64:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
-
-                       dbg_printf("load field ref offset %u type s64\n",
-                               ref->offset);
-                       memcpy(&reg[insn->reg].v, &filter_stack_data[ref->offset],
-                               sizeof(struct literal_numeric));
-                       reg[insn->reg].type = REG_S64;
-                       reg[insn->reg].literal = 0;
-                       dbg_printf("ref load s64 %" PRIi64 "\n", reg[insn->reg].v);
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+               case atype_float:
+                       field_offset += sizeof(double);
                        break;
+               default:
+                       return -EINVAL;
                }
+       }
+       if (!field)
+               return -EINVAL;
 
-               case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
+       /* Check if field offset is too large for 16-bit offset */
+       if (field_offset > FILTER_BYTECODE_MAX_LEN - 1)
+               return -EINVAL;
 
-                       dbg_printf("load field ref offset %u type double\n",
-                               ref->offset);
-                       memcpy(&reg[insn->reg].d, &filter_stack_data[ref->offset],
-                               sizeof(struct literal_double));
-                       reg[insn->reg].type = REG_DOUBLE;
-                       reg[insn->reg].literal = 0;
-                       dbg_printf("ref load double %g\n", reg[insn->reg].d);
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
-                       break;
-               }
+       /* set type */
+       op = (struct load_op *) &runtime->code[reloc_offset];
 
-               case FILTER_OP_LOAD_STRING:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
+       switch (filter_op) {
+       case FILTER_OP_LOAD_FIELD_REF:
+       {
+               struct field_ref *field_ref;
 
-                       dbg_printf("load string %s\n", insn->data);
-                       reg[insn->reg].str = insn->data;
-                       reg[insn->reg].type = REG_STRING;
-                       reg[insn->reg].seq_len = UINT_MAX;
-                       reg[insn->reg].literal = 1;
-                       next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+               field_ref = (struct field_ref *) op->data;
+               switch (field->type.atype) {
+               case atype_integer:
+               case atype_enum:
+                       op->op = FILTER_OP_LOAD_FIELD_REF_S64;
                        break;
-               }
-
-               case FILTER_OP_LOAD_S64:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-
-                       memcpy(&reg[insn->reg].v, insn->data,
-                               sizeof(struct literal_numeric));
-                       dbg_printf("load s64 %" PRIi64 "\n", reg[insn->reg].v);
-                       reg[insn->reg].type = REG_S64;
-                       next_pc += sizeof(struct load_op)
-                                       + sizeof(struct literal_numeric);
+               case atype_array:
+               case atype_sequence:
+                       op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
                        break;
-               }
-
-               case FILTER_OP_LOAD_DOUBLE:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-
-                       memcpy(&reg[insn->reg].d, insn->data,
-                               sizeof(struct literal_double));
-                       dbg_printf("load s64 %g\n", reg[insn->reg].d);
-                       reg[insn->reg].type = REG_DOUBLE;
-                       next_pc += sizeof(struct load_op)
-                                       + sizeof(struct literal_double);
+               case atype_string:
+                       op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
                        break;
-               }
-               }
-       }
-end:
-       /* return 0 (discard) on error */
-       if (ret)
-               return 0;
-       return retval;
-}
-
-static
-int bin_op_compare_check(struct vreg reg[NR_REG], const char *str)
-{
-       switch (reg[REG_R0].type) {
-       default:
-               goto error_unknown;
-
-       case REG_STRING:
-               switch (reg[REG_R1].type) {
-               default:
-                       goto error_unknown;
-
-               case REG_STRING:
+               case atype_float:
+                       op->op = FILTER_OP_LOAD_FIELD_REF_DOUBLE;
                        break;
-               case REG_S64:
-               case REG_DOUBLE:
-                       goto error_mismatch;
-               }
-               break;
-       case REG_S64:
-       case REG_DOUBLE:
-               switch (reg[REG_R1].type) {
                default:
-                       goto error_unknown;
-
-               case REG_STRING:
-                       goto error_mismatch;
-
-               case REG_S64:
-               case REG_DOUBLE:
-                       break;
+                       return -EINVAL;
                }
+               /* set offset */
+               field_ref->offset = (uint16_t) field_offset;
                break;
        }
+       default:
+               return -EINVAL;
+       }
        return 0;
-
-error_unknown:
-
-       return -EINVAL;
-error_mismatch:
-       ERR("type mismatch for '%s' binary operator\n", str);
-       return -EINVAL;
 }
 
 static
-int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode)
+int apply_context_reloc(struct lttng_event *event,
+               struct bytecode_runtime *runtime,
+               uint32_t runtime_len,
+               uint32_t reloc_offset,
+               const char *context_name,
+               enum filter_op filter_op)
 {
-       void *pc, *next_pc, *start_pc;
-       int ret = -EINVAL;
-       struct vreg reg[NR_REG];
-       int i;
-
-       for (i = 0; i < NR_REG; i++) {
-               reg[i].type = REG_TYPE_UNKNOWN;
-               reg[i].literal = 0;
-       }
-
-       start_pc = &bytecode->data[0];
-       for (pc = next_pc = start_pc; pc - start_pc < bytecode->len;
-                       pc = next_pc) {
-               if (unlikely(pc >= start_pc + bytecode->len)) {
-                       ERR("filter bytecode overflow\n");
-                       ret = -EINVAL;
-                       goto end;
-               }
-               dbg_printf("Validating op %s (%u)\n",
-                       print_op((unsigned int) *(filter_opcode_t *) pc),
-                       (unsigned int) *(filter_opcode_t *) pc);
-               switch (*(filter_opcode_t *) pc) {
-               case FILTER_OP_UNKNOWN:
-               default:
-                       ERR("unknown bytecode op %u\n",
-                               (unsigned int) *(filter_opcode_t *) pc);
-                       ret = -EINVAL;
-                       goto end;
+       struct load_op *op;
+       struct lttng_ctx_field *ctx_field;
+       int idx;
+       struct lttng_session *session = runtime->p.session;
 
-               case FILTER_OP_RETURN:
-                       ret = 0;
-                       goto end;
+       dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
 
-               /* binary */
-               case FILTER_OP_MUL:
-               case FILTER_OP_DIV:
-               case FILTER_OP_MOD:
-               case FILTER_OP_PLUS:
-               case FILTER_OP_MINUS:
-               case FILTER_OP_RSHIFT:
-               case FILTER_OP_LSHIFT:
-               case FILTER_OP_BIN_AND:
-               case FILTER_OP_BIN_OR:
-               case FILTER_OP_BIN_XOR:
-                       ERR("unsupported bytecode op %u\n",
-                               (unsigned int) *(filter_opcode_t *) pc);
-                       ret = -EINVAL;
-                       goto end;
+       /* Get context index */
+       idx = lttng_get_context_index(session->ctx, context_name);
+       if (idx < 0) {
+               if (lttng_context_is_app(context_name)) {
+                       int ret;
 
-               case FILTER_OP_EQ:
-               {
-                       ret = bin_op_compare_check(reg, "==");
-                       if (ret)
-                               goto end;
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_NE:
-               {
-                       ret = bin_op_compare_check(reg, "!=");
+                       ret = lttng_ust_add_app_context_to_ctx_rcu(context_name,
+                                       &session->ctx);
                        if (ret)
-                               goto end;
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_GT:
-               {
-                       ret = bin_op_compare_check(reg, ">");
-                       if (ret)
-                               goto end;
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_LT:
-               {
-                       ret = bin_op_compare_check(reg, "<");
-                       if (ret)
-                               goto end;
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_GE:
-               {
-                       ret = bin_op_compare_check(reg, ">=");
-                       if (ret)
-                               goto end;
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-               case FILTER_OP_LE:
-               {
-                       ret = bin_op_compare_check(reg, "<=");
-                       if (ret)
-                               goto end;
-                       reg[REG_R0].type = REG_S64;
-                       next_pc += sizeof(struct binary_op);
-                       break;
-               }
-
-               /* unary */
-               case FILTER_OP_UNARY_PLUS:
-               case FILTER_OP_UNARY_MINUS:
-               case FILTER_OP_UNARY_NOT:
-               {
-                       struct unary_op *insn = (struct unary_op *) pc;
-
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       switch (reg[insn->reg].type) {
-                       default:
-                               ERR("unknown register type\n");
-                               ret = -EINVAL;
-                               goto end;
-
-                       case REG_STRING:
-                               ERR("Unary op can only be applied to numeric or floating point registers\n");
-                               ret = -EINVAL;
-                               goto end;
-                       case REG_S64:
-                               break;
-                       case REG_DOUBLE:
-                               break;
-                       }
-                       next_pc += sizeof(struct unary_op);
-                       break;
-               }
-               /* logical */
-               case FILTER_OP_AND:
-               case FILTER_OP_OR:
-               {
-                       struct logical_op *insn = (struct logical_op *) pc;
-
-                       if (unlikely(reg[REG_R0].type == REG_TYPE_UNKNOWN
-                                       || reg[REG_R0].type == REG_TYPE_UNKNOWN
-                                       || reg[REG_R0].type == REG_STRING
-                                       || reg[REG_R1].type == REG_STRING)) {
-                               ERR("Logical comparator can only be applied to numeric and floating point registers\n");
-                               ret = -EINVAL;
-                               goto end;
-                       }
-
-                       dbg_printf("Validate jumping to bytecode offset %u\n",
-                               (unsigned int) insn->skip_offset);
-                       if (unlikely(start_pc + insn->skip_offset <= pc)) {
-                               ERR("Loops are not allowed in bytecode\n");
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       next_pc += sizeof(struct logical_op);
-                       break;
+                               return ret;
+                       idx = lttng_get_context_index(session->ctx,
+                               context_name);
+                       if (idx < 0)
+                               return -ENOENT;
+               } else {
+                       return -ENOENT;
                }
+       }
+       /* Check if idx is too large for 16-bit offset */
+       if (idx > FILTER_BYTECODE_MAX_LEN - 1)
+               return -EINVAL;
 
-               /* load */
-               case FILTER_OP_LOAD_FIELD_REF:
-               {
-                       ERR("Unknown field ref type\n");
-                       ret = -EINVAL;
-                       goto end;
-               }
-               case FILTER_OP_LOAD_FIELD_REF_STRING:
-               case FILTER_OP_LOAD_FIELD_REF_SEQUENCE:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
+       /* Get context return type */
+       ctx_field = &session->ctx->fields[idx];
+       op = (struct load_op *) &runtime->code[reloc_offset];
 
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       dbg_printf("Validate load field ref offset %u type string\n",
-                               ref->offset);
-                       reg[insn->reg].type = REG_STRING;
-                       reg[insn->reg].literal = 0;
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
-                       break;
-               }
-               case FILTER_OP_LOAD_FIELD_REF_S64:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
+       switch (filter_op) {
+       case FILTER_OP_GET_CONTEXT_REF:
+       {
+               struct field_ref *field_ref;
 
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       dbg_printf("Validate load field ref offset %u type s64\n",
-                               ref->offset);
-                       reg[insn->reg].type = REG_S64;
-                       reg[insn->reg].literal = 0;
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
-                       break;
-               }
-               case FILTER_OP_LOAD_FIELD_REF_DOUBLE:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-                       struct field_ref *ref = (struct field_ref *) insn->data;
-
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       dbg_printf("Validate load field ref offset %u type double\n",
-                               ref->offset);
-                       reg[insn->reg].type = REG_DOUBLE;
-                       reg[insn->reg].literal = 0;
-                       next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+               field_ref = (struct field_ref *) op->data;
+               switch (ctx_field->event_field.type.atype) {
+               case atype_integer:
+               case atype_enum:
+                       op->op = FILTER_OP_GET_CONTEXT_REF_S64;
                        break;
-               }
-
-               case FILTER_OP_LOAD_STRING:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       reg[insn->reg].type = REG_STRING;
-                       reg[insn->reg].literal = 1;
-                       next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+                       /* Sequence and array supported as string */
+               case atype_string:
+               case atype_array:
+               case atype_sequence:
+                       op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
                        break;
-               }
-
-               case FILTER_OP_LOAD_S64:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       reg[insn->reg].type = REG_S64;
-                       next_pc += sizeof(struct load_op)
-                                       + sizeof(struct literal_numeric);
+               case atype_float:
+                       op->op = FILTER_OP_GET_CONTEXT_REF_DOUBLE;
                        break;
-               }
-
-               case FILTER_OP_LOAD_DOUBLE:
-               {
-                       struct load_op *insn = (struct load_op *) pc;
-
-                       if (unlikely(insn->reg >= REG_ERROR)) {
-                               ERR("invalid register %u\n",
-                                       (unsigned int) insn->reg);
-                               ret = -EINVAL;
-                               goto end;
-                       }
-                       reg[insn->reg].type = REG_DOUBLE;
-                       next_pc += sizeof(struct load_op)
-                                       + sizeof(struct literal_double);
+               case atype_dynamic:
+                       op->op = FILTER_OP_GET_CONTEXT_REF;
                        break;
+               default:
+                       return -EINVAL;
                }
-               }
+               /* set offset to context index within channel contexts */
+               field_ref->offset = (uint16_t) idx;
+               break;
        }
-end:
-       return ret;
+       default:
+               return -EINVAL;
+       }
+       return 0;
 }
 
 static
-int apply_field_reloc(struct ltt_event *event,
+int apply_reloc(struct lttng_event *event,
                struct bytecode_runtime *runtime,
                uint32_t runtime_len,
                uint32_t reloc_offset,
-               const char *field_name)
+               const char *name)
 {
-       const struct lttng_event_desc *desc;
-       const struct lttng_event_field *fields, *field = NULL;
-       unsigned int nr_fields, i;
-       struct field_ref *field_ref;
        struct load_op *op;
-       uint32_t field_offset = 0;
 
-       dbg_printf("Apply reloc: %u %s\n", reloc_offset, field_name);
+       dbg_printf("Apply reloc: %u %s\n", reloc_offset, name);
 
        /* Ensure that the reloc is within the code */
        if (runtime_len - reloc_offset < sizeof(uint16_t))
                return -EINVAL;
 
-       /* Lookup event by name */
-       desc = event->desc;
-       if (!desc)
-               return -EINVAL;
-       fields = desc->fields;
-       if (!fields)
+       op = (struct load_op *) &runtime->code[reloc_offset];
+       switch (op->op) {
+       case FILTER_OP_LOAD_FIELD_REF:
+               return apply_field_reloc(event, runtime, runtime_len,
+                       reloc_offset, name, op->op);
+       case FILTER_OP_GET_CONTEXT_REF:
+               return apply_context_reloc(event, runtime, runtime_len,
+                       reloc_offset, name, op->op);
+       case FILTER_OP_GET_SYMBOL:
+       case FILTER_OP_GET_SYMBOL_FIELD:
+               /*
+                * Will be handled by load specialize phase or
+                * dynamically by interpreter.
+                */
+               return 0;
+       default:
+               ERR("Unknown reloc op type %u\n", op->op);
                return -EINVAL;
-       nr_fields = desc->nr_fields;
-       for (i = 0; i < nr_fields; i++) {
-               if (!strcmp(fields[i].name, field_name)) {
-                       field = &fields[i];
-                       break;
-               }
-               /* compute field offset */
-               switch (fields[i].type.atype) {
-               case atype_integer:
-               case atype_enum:
-                       field_offset += sizeof(int64_t);
-                       break;
-               case atype_array:
-               case atype_sequence:
-                       field_offset += sizeof(unsigned long);
-                       field_offset += sizeof(void *);
-                       break;
-               case atype_string:
-                       field_offset += sizeof(void *);
-                       break;
-               case atype_float:
-                       field_offset += sizeof(double);
-                       break;
-               default:
-                       return -EINVAL;
-               }
        }
-       if (!field)
-               return -EINVAL;
+       return 0;
+}
 
-       /* Check if field offset is too large for 16-bit offset */
-       if (field_offset > FILTER_BYTECODE_MAX_LEN)
-               return -EINVAL;
+static
+int bytecode_is_linked(struct lttng_ust_filter_bytecode_node *filter_bytecode,
+               struct lttng_event *event)
+{
+       struct lttng_bytecode_runtime *bc_runtime;
 
-       /* set type */
-       op = (struct load_op *) &runtime->data[reloc_offset];
-       field_ref = (struct field_ref *) op->data;
-       switch (field->type.atype) {
-       case atype_integer:
-       case atype_enum:
-               op->op = FILTER_OP_LOAD_FIELD_REF_S64;
-               break;
-       case atype_array:
-       case atype_sequence:
-               op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
-               break;
-       case atype_string:
-               op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
-               break;
-       case atype_float:
-               op->op = FILTER_OP_LOAD_FIELD_REF_DOUBLE;
-               break;
-       default:
-               return -EINVAL;
+       cds_list_for_each_entry(bc_runtime,
+                       &event->bytecode_runtime_head, node) {
+               if (bc_runtime->bc == filter_bytecode)
+                       return 1;
        }
-       /* set offset */
-       field_ref->offset = (uint16_t) field_offset;
        return 0;
 }
 
@@ -1174,8 +413,9 @@ int apply_field_reloc(struct ltt_event *event,
  * bytecode runtime.
  */
 static
-int _lttng_filter_event_link_bytecode(struct ltt_event *event,
-               struct lttng_ust_filter_bytecode *filter_bytecode)
+int _lttng_filter_event_link_bytecode(struct lttng_event *event,
+               struct lttng_ust_filter_bytecode_node *filter_bytecode,
+               struct cds_list_head *insert_loc)
 {
        int ret, offset, next_offset;
        struct bytecode_runtime *runtime = NULL;
@@ -1183,122 +423,147 @@ int _lttng_filter_event_link_bytecode(struct ltt_event *event,
 
        if (!filter_bytecode)
                return 0;
-       /* Even is not connected to any description */
-       if (!event->desc)
-               return 0;
        /* Bytecode already linked */
-       if (event->filter || event->filter_data)
+       if (bytecode_is_linked(filter_bytecode, event))
                return 0;
 
-       dbg_printf("Linking\n");
+       dbg_printf("Linking...\n");
 
        /* We don't need the reloc table in the runtime */
-       runtime_alloc_len = sizeof(*runtime) + filter_bytecode->reloc_offset;
+       runtime_alloc_len = sizeof(*runtime) + filter_bytecode->bc.reloc_offset;
        runtime = zmalloc(runtime_alloc_len);
        if (!runtime) {
                ret = -ENOMEM;
-               goto link_error;
+               goto alloc_error;
        }
-       runtime->len = filter_bytecode->reloc_offset;
+       runtime->p.bc = filter_bytecode;
+       runtime->p.session = event->chan->session;
+       runtime->p.event = event;
+       runtime->len = filter_bytecode->bc.reloc_offset;
        /* copy original bytecode */
-       memcpy(runtime->data, filter_bytecode->data, runtime->len);
+       memcpy(runtime->code, filter_bytecode->bc.data, runtime->len);
        /*
         * apply relocs. Those are a uint16_t (offset in bytecode)
         * followed by a string (field name).
         */
-       for (offset = filter_bytecode->reloc_offset;
-                       offset < filter_bytecode->len;
+       for (offset = filter_bytecode->bc.reloc_offset;
+                       offset < filter_bytecode->bc.len;
                        offset = next_offset) {
                uint16_t reloc_offset =
-                       *(uint16_t *) &filter_bytecode->data[offset];
-               const char *field_name =
-                       (const char *) &filter_bytecode->data[offset + sizeof(uint16_t)];
+                       *(uint16_t *) &filter_bytecode->bc.data[offset];
+               const char *name =
+                       (const char *) &filter_bytecode->bc.data[offset + sizeof(uint16_t)];
 
-               ret = apply_field_reloc(event, runtime, runtime->len, reloc_offset, field_name);
+               ret = apply_reloc(event, runtime, runtime->len, reloc_offset, name);
                if (ret) {
                        goto link_error;
                }
-               next_offset = offset + sizeof(uint16_t) + strlen(field_name) + 1;
+               next_offset = offset + sizeof(uint16_t) + strlen(name) + 1;
        }
        /* Validate bytecode */
        ret = lttng_filter_validate_bytecode(runtime);
        if (ret) {
                goto link_error;
        }
-       event->filter_data = runtime;
-       event->filter = lttng_filter_interpret_bytecode;
+       /* Specialize bytecode */
+       ret = lttng_filter_specialize_bytecode(event, runtime);
+       if (ret) {
+               goto link_error;
+       }
+       runtime->p.filter = lttng_filter_interpret_bytecode;
+       runtime->p.link_failed = 0;
+       cds_list_add_rcu(&runtime->p.node, insert_loc);
+       dbg_printf("Linking successful.\n");
        return 0;
 
 link_error:
-       event->filter = lttng_filter_false;
-       free(runtime);
+       runtime->p.filter = lttng_filter_false;
+       runtime->p.link_failed = 1;
+       cds_list_add_rcu(&runtime->p.node, insert_loc);
+alloc_error:
+       dbg_printf("Linking failed.\n");
        return ret;
 }
 
-void lttng_filter_event_link_bytecode(struct ltt_event *event,
-               struct lttng_ust_filter_bytecode *filter_bytecode)
+void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
 {
-       int ret;
+       struct lttng_ust_filter_bytecode_node *bc = runtime->bc;
 
-       ret = _lttng_filter_event_link_bytecode(event, filter_bytecode);
-       if (ret) {
-               fprintf(stderr, "[lttng filter] error linking event bytecode\n");
-       }
+       if (!bc->enabler->enabled || runtime->link_failed)
+               runtime->filter = lttng_filter_false;
+       else
+               runtime->filter = lttng_filter_interpret_bytecode;
 }
 
 /*
- * Link bytecode to all events for a wildcard. Skips events that already
- * have a bytecode linked.
- * We do not set each event's filter_bytecode field, because they do not
- * own the filter_bytecode: the wildcard owns it.
+ * Link bytecode for all enablers referenced by an event.
  */
-void lttng_filter_wildcard_link_bytecode(struct session_wildcard *wildcard)
+void lttng_enabler_event_link_bytecode(struct lttng_event *event,
+               struct lttng_enabler *enabler)
 {
-       struct ltt_event *event;
-       int ret;
+       struct lttng_ust_filter_bytecode_node *bc;
+       struct lttng_bytecode_runtime *runtime;
+
+       /* Can only be called for events with desc attached */
+       assert(event->desc);
 
-       if (!wildcard->filter_bytecode)
-               return;
+       /* Link each bytecode. */
+       cds_list_for_each_entry(bc, &enabler->filter_bytecode_head, node) {
+               int found = 0, ret;
+               struct cds_list_head *insert_loc;
 
-       cds_list_for_each_entry(event, &wildcard->events, wildcard_list) {
-               if (event->filter)
+               cds_list_for_each_entry(runtime,
+                               &event->bytecode_runtime_head, node) {
+                       if (runtime->bc == bc) {
+                               found = 1;
+                               break;
+                       }
+               }
+               /* Skip bytecode already linked */
+               if (found)
                        continue;
-               ret = _lttng_filter_event_link_bytecode(event,
-                               wildcard->filter_bytecode);
+
+               /*
+                * Insert at specified priority (seqnum) in increasing
+                * order.
+                */
+               cds_list_for_each_entry_reverse(runtime,
+                               &event->bytecode_runtime_head, node) {
+                       if (runtime->bc->bc.seqnum < bc->bc.seqnum) {
+                               /* insert here */
+                               insert_loc = &runtime->node;
+                               goto add_within;
+                       }
+               }
+               /* Add to head to list */
+               insert_loc = &event->bytecode_runtime_head;
+       add_within:
+               dbg_printf("linking bytecode\n");
+               ret = _lttng_filter_event_link_bytecode(event, bc,
+                               insert_loc);
                if (ret) {
-                       fprintf(stderr, "[lttng filter] error linking wildcard bytecode\n");
+                       dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
                }
-
        }
-       return;
 }
 
 /*
- * Need to attach filter to an event before starting tracing for the
- * session. We own the filter_bytecode if we return success.
+ * We own the filter_bytecode if we return success.
  */
-int lttng_filter_event_attach_bytecode(struct ltt_event *event,
-               struct lttng_ust_filter_bytecode *filter_bytecode)
+int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
+               struct lttng_ust_filter_bytecode_node *filter_bytecode)
 {
-       if (event->chan->session->been_active)
-               return -EPERM;
-       if (event->filter_bytecode)
-               return -EEXIST;
-       event->filter_bytecode = filter_bytecode;
+       cds_list_add(&filter_bytecode->node, &enabler->filter_bytecode_head);
        return 0;
 }
 
-/*
- * Need to attach filter to a wildcard before starting tracing for the
- * session. We own the filter_bytecode if we return success.
- */
-int lttng_filter_wildcard_attach_bytecode(struct session_wildcard *wildcard,
-               struct lttng_ust_filter_bytecode *filter_bytecode)
+void lttng_free_event_filter_runtime(struct lttng_event *event)
 {
-       if (wildcard->chan->session->been_active)
-               return -EPERM;
-       if (wildcard->filter_bytecode)
-               return -EEXIST;
-       wildcard->filter_bytecode = filter_bytecode;
-       return 0;
+       struct bytecode_runtime *runtime, *tmp;
+
+       cds_list_for_each_entry_safe(runtime, tmp,
+                       &event->bytecode_runtime_head, p.node) {
+               free(runtime->data);
+               free(runtime);
+       }
 }
This page took 0.042023 seconds and 4 git commands to generate.