Fix: memory leaks on event notifier destroy

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

diff --git a/src/lttng-bytecode.c b/src/lttng-bytecode.c
index 5b6cb1171b43b9cea3266114c36853c80ae18131..86ffe94985147aec879dc9e9151d95ade9af83b7 100644 (file)
--- a/src/lttng-bytecode.c
+++ b/src/lttng-bytecode.c
@@ -457,6 +457,9 @@ int link_bytecode(const struct lttng_event_desc *event_desc,
        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);
        }
@@ -472,6 +475,9 @@ link_error:
        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);
        }
@@ -492,10 +498,20 @@ void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime)
                runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
 }
 
+void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+{
+       struct lttng_bytecode_node *bc = runtime->bc;
+
+       if (!bc->enabler->enabled || runtime->link_failed)
+               runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+       else
+               runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+}
+
 /*
- * Given the lists of bytecode programs of an instance (trigger or event) and
- * of a matching enabler, try to link all the enabler's bytecode programs with
- * the instance.
+ * Given the lists of bytecode programs of an instance (event or event
+ * notifier) and of a matching enabler, try to link all the enabler's bytecode
+ * programs with the instance.
  *
  * This function is called after we confirmed that name enabler and the
  * instance are matching names (or glob pattern matching).
@@ -587,3 +603,14 @@ void lttng_free_event_filter_runtime(struct lttng_event *event)
                kfree(runtime);
        }
 }
+
+void lttng_free_event_notifier_filter_runtime(struct lttng_event_notifier *event_notifier)
+{
+       struct bytecode_runtime *runtime, *tmp;
+
+       list_for_each_entry_safe(runtime, tmp,
+                       &event_notifier->filter_bytecode_runtime_head, p.node) {
+               kfree(runtime->data);
+               kfree(runtime);
+       }
+}