Refactoring: bytecode interpreter ABI

[lttng-ust.git] / liblttng-ust / lttng-bytecode.c

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index d75600baee9a92e83e68cdae30a981bfd8c416f0..6ce5e54a39827bf385f5491169a630712a0650fe 100644 (file)
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -432,6 +432,7 @@ int link_bytecode(struct lttng_ust_event_desc *event_desc,
        runtime->p.priv = runtime_priv;
        runtime->p.struct_size = sizeof(struct lttng_ust_bytecode_runtime);
        runtime_priv->pub = runtime;
+       runtime_priv->type = bytecode->type;
        runtime_priv->bc = bytecode;
        runtime_priv->pctx = ctx;
        runtime->len = bytecode->bc.reloc_offset;
@@ -466,34 +467,14 @@ int link_bytecode(struct lttng_ust_event_desc *event_desc,
                goto link_error;
        }
 
-       switch (bytecode->type) {
-       case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
-               runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
-               break;
-       case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
-               runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret;
-               break;
-       default:
-               abort();
-       }
-
+       runtime->p.interpreter_func = lttng_bytecode_interpret;
        runtime->p.priv->link_failed = 0;
        cds_list_add_rcu(&runtime->p.node, insert_loc);
        dbg_printf("Linking successful.\n");
        return 0;
 
 link_error:
-       switch (bytecode->type) {
-       case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
-               runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
-               break;
-       case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE:
-               runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
-               break;
-       default:
-               abort();
-       }
-
+       runtime->p.interpreter_func = lttng_bytecode_interpret_error;
        runtime_priv->link_failed = 1;
        cds_list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
@@ -501,24 +482,14 @@ alloc_error:
        return ret;
 }
 
-void lttng_bytecode_filter_sync_state(struct lttng_ust_bytecode_runtime *runtime)
-{
-       struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
-
-       if (!bc->enabler->enabled || runtime->priv->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_ust_bytecode_runtime *runtime)
+void lttng_bytecode_sync_state(struct lttng_ust_bytecode_runtime *runtime)
 {
        struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
 
        if (!bc->enabler->enabled || runtime->priv->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;
 }
 
 /*