From 4d451c15c1e519f108b1b6d01fbda2c6975a2a3b Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Mon, 27 Apr 2020 17:31:50 -0400 Subject: [PATCH] bytecode: rename `lttng_filter_sync_state()` -> `lttng_bytecode_filter_sync_state()` Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Change-Id: I8d6386a087d5df1844bd157af571c08f41d54a9b --- include/lttng/ust-events.h | 2 +- liblttng-ust/lttng-bytecode.c | 7 ++++++- liblttng-ust/lttng-bytecode.h | 2 ++ liblttng-ust/lttng-events.c | 5 +++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 356fa3b0..ae5ce5f6 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -812,7 +812,6 @@ struct lttng_ust_field_iter * lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list); void lttng_free_event_filter_runtime(struct lttng_event *event); -void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime); struct cds_list_head *lttng_get_probe_list_head(void); int lttng_session_active(void); @@ -848,6 +847,7 @@ int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler, struct lttng_ust_excluder_node *excluder); void lttng_enabler_event_link_bytecode(struct lttng_event *event, struct lttng_enabler *enabler); +void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime); #ifdef __cplusplus } diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c index 9153674d..47efdeca 100644 --- a/liblttng-ust/lttng-bytecode.c +++ b/liblttng-ust/lttng-bytecode.c @@ -493,7 +493,7 @@ 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; @@ -590,3 +590,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) +{ +} diff --git a/liblttng-ust/lttng-bytecode.h b/liblttng-ust/lttng-bytecode.h index 4f1b88f1..5742f7f5 100644 --- a/liblttng-ust/lttng-bytecode.h +++ b/liblttng-ust/lttng-bytecode.h @@ -331,6 +331,8 @@ struct lttng_interpreter_output { const char *print_op(enum bytecode_op op); +void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime); + int lttng_bytecode_validate(struct bytecode_runtime *bytecode); int lttng_bytecode_specialize(const struct lttng_event_desc *event_desc, struct bytecode_runtime *bytecode); diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c index 716a764e..d6d0642d 100644 --- a/liblttng-ust/lttng-events.c +++ b/liblttng-ust/lttng-events.c @@ -59,6 +59,7 @@ #include "tracepoint-internal.h" #include "string-utils.h" +#include "lttng-bytecode.h" #include "lttng-tracer.h" #include "lttng-tracer-core.h" #include "lttng-ust-statedump.h" @@ -1635,7 +1636,7 @@ void lttng_session_sync_event_enablers(struct lttng_session *session) /* Enable filters */ cds_list_for_each_entry(runtime, &event->filter_bytecode_runtime_head, node) { - lttng_filter_sync_state(runtime); + lttng_bytecode_filter_sync_state(runtime); } } __tracepoint_probe_prune_release_queue(); @@ -1816,7 +1817,7 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group /* Enable filters */ cds_list_for_each_entry(runtime, &event_notifier->filter_bytecode_runtime_head, node) { - lttng_filter_sync_state(runtime); + lttng_bytecode_filter_sync_state(runtime); } } __tracepoint_probe_prune_release_queue(); -- 2.34.1