Fix: Convert rcu tracepointis to gp_seq (v4.19)

[lttng-modules.git] / lttng-filter-interpreter.c

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index ffce2150af3aacdb62789a21e413f9d7bb50ccac..d9605cb2a068f4e3a187f27e56882e6d5256ada4 100644 (file)
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -21,8 +21,11 @@
  */
 
 #include <linux/uaccess.h>
+#include <wrapper/frame.h>
 
-#include "lttng-filter.h"
+#include <lttng-filter.h>
+
+LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
 
 /*
  * get_char should be called with page fault handler disabled if it is expected
@@ -119,21 +122,16 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
                        }
                }
                if (unlikely(char_ax == '\0')) {
-                       if (char_bx == '\0') {
-                               diff = 0;
-                               break;
-                       } else {
-                               if (estack_bx(stack, top)->u.s.literal) {
-                                       ret = parse_char(estack_bx(stack, top),
-                                               &char_bx, &offset_bx);
-                                       if (ret == -1) {
-                                               diff = 0;
-                                               break;
-                                       }
+                       if (estack_bx(stack, top)->u.s.literal) {
+                               ret = parse_char(estack_bx(stack, top),
+                                       &char_bx, &offset_bx);
+                               if (ret == -1) {
+                                       diff = 0;
+                                       break;
                                }
-                               diff = 1;
-                               break;
                        }
+                       diff = 1;
+                       break;
                }
                if (estack_bx(stack, top)->u.s.literal) {
                        ret = parse_char(estack_bx(stack, top),
@@ -183,6 +181,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 }
 
 uint64_t lttng_filter_false(void *filter_data,
+               struct lttng_probe_ctx *lttng_probe_ctx,
                const char *filter_stack_data)
 {
        return 0;
@@ -240,6 +239,7 @@ LABEL_##name
  * effect.
  */
 uint64_t lttng_filter_interpret_bytecode(void *filter_data,
+               struct lttng_probe_ctx *lttng_probe_ctx,
                const char *filter_stack_data)
 {
        struct bytecode_runtime *bytecode = filter_data;
@@ -766,7 +766,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        dbg_printk("get context ref offset %u type string\n",
                                ref->offset);
                        ctx_field = &lttng_static_ctx->fields[ref->offset];
-                       ctx_field->get_value(ctx_field, &v);
+                       ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
                        estack_push(stack, top, ax, bx);
                        estack_ax(stack, top)->u.s.str = v.str;
                        if (unlikely(!estack_ax(stack, top)->u.s.str)) {
@@ -792,7 +792,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        dbg_printk("get context ref offset %u type s64\n",
                                ref->offset);
                        ctx_field = &lttng_static_ctx->fields[ref->offset];
-                       ctx_field->get_value(ctx_field, &v);
+                       ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
                        estack_push(stack, top, ax, bx);
                        estack_ax_v = v.s64;
                        dbg_printk("ref get context s64 %lld\n",
@@ -816,7 +816,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        dbg_printk("load field ref offset %u type user string\n",
                                ref->offset);
                        estack_push(stack, top, ax, bx);
-                       estack_ax(stack, top)->u.s.str =
+                       estack_ax(stack, top)->u.s.user_str =
                                *(const char * const *) &filter_stack_data[ref->offset];
                        if (unlikely(!estack_ax(stack, top)->u.s.str)) {
                                dbg_printk("Filter warning: loading a NULL string.\n");
@@ -841,7 +841,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
                        estack_push(stack, top, ax, bx);
                        estack_ax(stack, top)->u.s.seq_len =
                                *(unsigned long *) &filter_stack_data[ref->offset];
-                       estack_ax(stack, top)->u.s.str =
+                       estack_ax(stack, top)->u.s.user_str =
                                *(const char **) (&filter_stack_data[ref->offset
                                                                + sizeof(unsigned long)]);
                        if (unlikely(!estack_ax(stack, top)->u.s.str)) {