Sync `show_inode_state()` macro with upstream stable kernels

[lttng-modules.git] / src / lttng-bytecode.c

diff --git a/src/lttng-bytecode.c b/src/lttng-bytecode.c
index 5e4f8b3c74171061272fde6ab39d25b8e58bbc3d..b1437774b96a063256024b66b5c3089b1fc808ce 100644 (file)
--- a/src/lttng-bytecode.c
+++ b/src/lttng-bytecode.c
@@ -175,7 +175,7 @@ int apply_field_reloc(const struct lttng_kernel_event_desc *event_desc,
                const char *field_name,
                enum bytecode_op bytecode_op)
 {
-       const struct lttng_kernel_event_field **fields, *field = NULL;
+       const struct lttng_kernel_event_field * const *fields, *field = NULL;
        unsigned int nr_fields, i;
        struct load_op *op;
        uint32_t field_offset = 0;
@@ -185,10 +185,10 @@ int apply_field_reloc(const struct lttng_kernel_event_desc *event_desc,
        /* Lookup event by name */
        if (!event_desc)
                return -EINVAL;
-       fields = event_desc->fields;
+       fields = event_desc->tp_class->fields;
        if (!fields)
                return -EINVAL;
-       nr_fields = event_desc->nr_fields;
+       nr_fields = event_desc->tp_class->nr_fields;
        for (i = 0; i < nr_fields; i++) {
                if (fields[i]->nofilter)
                        continue;
@@ -408,10 +408,10 @@ int apply_reloc(const struct lttng_kernel_event_desc *event_desc,
 }
 
 static
-int bytecode_is_linked(struct lttng_bytecode_node *bytecode,
+int bytecode_is_linked(struct lttng_kernel_bytecode_node *bytecode,
                struct list_head *bytecode_runtime_head)
 {
-       struct lttng_bytecode_runtime *bc_runtime;
+       struct lttng_kernel_bytecode_runtime *bc_runtime;
 
        list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
                if (bc_runtime->bc == bytecode)
@@ -427,7 +427,7 @@ int bytecode_is_linked(struct lttng_bytecode_node *bytecode,
 static
 int link_bytecode(const struct lttng_kernel_event_desc *event_desc,
                struct lttng_kernel_ctx *ctx,
-               struct lttng_bytecode_node *bytecode,
+               struct lttng_kernel_bytecode_node *bytecode,
                struct list_head *bytecode_runtime_head,
                struct list_head *insert_loc)
 {
@@ -450,6 +450,7 @@ int link_bytecode(const struct lttng_kernel_event_desc *event_desc,
                ret = -ENOMEM;
                goto alloc_error;
        }
+       runtime->p.type = bytecode->type;
        runtime->p.bc = bytecode;
        runtime->p.ctx = ctx;
        runtime->len = bytecode->bc.reloc_offset;
@@ -483,18 +484,7 @@ int link_bytecode(const struct lttng_kernel_event_desc *event_desc,
        if (ret) {
                goto link_error;
        }
-
-       switch (bytecode->type) {
-       case LTTNG_BYTECODE_NODE_TYPE_FILTER:
-               runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
-               break;
-       case LTTNG_BYTECODE_NODE_TYPE_CAPTURE:
-               runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
-               break;
-       default:
-               WARN_ON(1);
-       }
-
+       runtime->p.interpreter_func = lttng_bytecode_interpret;
        runtime->p.link_failed = 0;
        list_add_rcu(&runtime->p.node, insert_loc);
        dbg_printk("Linking successful.\n");
@@ -502,16 +492,7 @@ int link_bytecode(const struct lttng_kernel_event_desc *event_desc,
 
 link_error:
 
-       switch (bytecode->type) {
-       case LTTNG_BYTECODE_NODE_TYPE_FILTER:
-               runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
-               break;
-       case LTTNG_BYTECODE_NODE_TYPE_CAPTURE:
-               runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
-               break;
-       default:
-               WARN_ON(1);
-       }
+       runtime->p.interpreter_func = lttng_bytecode_interpret_error;
        runtime->p.link_failed = 1;
        list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
@@ -519,24 +500,14 @@ alloc_error:
        return ret;
 }
 
-void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
-{
-       struct lttng_bytecode_node *bc = runtime->bc;
-
-       if (!bc->enabler->enabled || runtime->link_failed)
-               runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
-       else
-               runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
-}
-
-void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_sync_state(struct lttng_kernel_bytecode_runtime *runtime)
 {
-       struct lttng_bytecode_node *bc = runtime->bc;
+       struct lttng_kernel_bytecode_node *bc = runtime->bc;
 
        if (!bc->enabler->enabled || runtime->link_failed)
-               runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+               runtime->interpreter_func = lttng_bytecode_interpret_error;
        else
-               runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+               runtime->interpreter_func = lttng_bytecode_interpret;
 }
 
 /*
@@ -552,8 +523,8 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des
                struct list_head *instance_bytecode_head,
                struct list_head *enabler_bytecode_head)
 {
-       struct lttng_bytecode_node *enabler_bc;
-       struct lttng_bytecode_runtime *runtime;
+       struct lttng_kernel_bytecode_node *enabler_bc;
+       struct lttng_kernel_bytecode_runtime *runtime;
 
        WARN_ON_ONCE(!event_desc);
 
@@ -608,7 +579,7 @@ void lttng_enabler_link_bytecode(const struct lttng_kernel_event_desc *event_des
  * We own the filter_bytecode if we return success.
  */
 int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
-               struct lttng_bytecode_node *filter_bytecode)
+               struct lttng_kernel_bytecode_node *filter_bytecode)
 {
        list_add(&filter_bytecode->node, &enabler->filter_bytecode_head);
        return 0;
@@ -616,7 +587,7 @@ int lttng_filter_enabler_attach_bytecode(struct lttng_enabler *enabler,
 
 void lttng_free_enabler_filter_bytecode(struct lttng_enabler *enabler)
 {
-       struct lttng_bytecode_node *filter_bytecode, *tmp;
+       struct lttng_kernel_bytecode_node *filter_bytecode, *tmp;
 
        list_for_each_entry_safe(filter_bytecode, tmp,
                        &enabler->filter_bytecode_head, node) {