Cleanup: rename `_lttng_filter_link_bytecode()` -> `link_bytecode()`

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

diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c
index 9153674d81f268b032dcfdc273ba22ff37bfc819..a05117a14134fd19f98601e01a8a47c1f0e800e0 100644 (file)
--- a/liblttng-ust/lttng-bytecode.c
+++ b/liblttng-ust/lttng-bytecode.c
@@ -421,7 +421,7 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode,
  * bytecode runtime.
  */
 static
-int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc,
+int link_bytecode(const struct lttng_event_desc *event_desc,
                struct lttng_ctx **ctx,
                struct lttng_ust_bytecode_node *bytecode,
                struct cds_list_head *insert_loc)
@@ -478,14 +478,29 @@ int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc,
        if (ret) {
                goto link_error;
        }
-       runtime->p.filter = lttng_bytecode_filter_interpret;
+
+       switch (bytecode->type) {
+       case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
+               runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
+               break;
+       default:
+               abort();
+       }
+
        runtime->p.link_failed = 0;
        cds_list_add_rcu(&runtime->p.node, insert_loc);
        dbg_printf("Linking successful.\n");
        return 0;
 
 link_error:
-       runtime->p.filter = lttng_bytecode_filter_interpret_false;
+       switch (bytecode->type) {
+       case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER:
+               runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
+               break;
+       default:
+               abort();
+       }
+
        runtime->p.link_failed = 1;
        cds_list_add_rcu(&runtime->p.node, insert_loc);
 alloc_error:
@@ -493,14 +508,14 @@ alloc_error:
        return ret;
 }
 
-void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
 {
        struct lttng_ust_bytecode_node *bc = runtime->bc;
 
        if (!bc->enabler->enabled || runtime->link_failed)
-               runtime->filter = lttng_bytecode_filter_interpret_false;
+               runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
        else
-               runtime->filter = lttng_bytecode_filter_interpret;
+               runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
 }
 
 /*
@@ -550,8 +565,7 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc,
                insert_loc = bytecode_runtime_head;
        add_within:
                dbg_printf("linking bytecode\n");
-               ret = _lttng_filter_link_bytecode(event_desc, ctx, bc,
-                       insert_loc);
+               ret = link_bytecode(event_desc, ctx, bc, insert_loc);
                if (ret) {
                        dbg_printf("[lttng filter] warning: cannot link event bytecode\n");
                }
@@ -590,3 +604,8 @@ void lttng_free_event_notifier_filter_runtime(
 {
        free_filter_runtime(&event_notifier->filter_bytecode_runtime_head);
 }
+
+/* For backward compatibility. Leave those exported symbols in place. */
+void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime)
+{
+}