From 23d128de387ed5663eb22c89bf7beb2d0416676b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 17 Dec 2020 15:23:25 -0500 Subject: [PATCH] Move and hide new 'lttng_counter_transport_*' private symbols Change-Id: If7da4f9a2a046d2bce183d1c0d9016c89a8ce882 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/lttng/ust-events.h | 4 ---- liblttng-ust-ctl/ustctl.c | 1 + liblttng-ust/lttng-counter-client-percpu-32-modular.c | 1 + liblttng-ust/lttng-counter-client-percpu-64-modular.c | 1 + liblttng-ust/lttng-tracer-core.h | 7 +++++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index abb265f9..16c5abb1 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -746,9 +746,6 @@ int lttng_attach_context(struct lttng_ust_context *context_param, void lttng_transport_register(struct lttng_transport *transport); void lttng_transport_unregister(struct lttng_transport *transport); -void lttng_counter_transport_register(struct lttng_counter_transport *transport); -void lttng_counter_transport_unregister(struct lttng_counter_transport *transport); - struct lttng_counter *lttng_ust_counter_create( const char *counter_transport_name, size_t number_dimensions, const struct lttng_counter_dimension *dimensions); @@ -837,7 +834,6 @@ extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_cal extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite; struct lttng_transport *lttng_transport_find(const char *name); -struct lttng_counter_transport *lttng_counter_transport_find(const char *name); int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list); void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list); diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c index 259f40de..cfff4b17 100644 --- a/liblttng-ust-ctl/ustctl.c +++ b/liblttng-ust-ctl/ustctl.c @@ -36,6 +36,7 @@ #include "../liblttng-ust/lttng-rb-clients.h" #include "../liblttng-ust/clock.h" #include "../liblttng-ust/getenv.h" +#include "../liblttng-ust/lttng-tracer-core.h" #include "../libcounter/shm.h" #include "../libcounter/smp.h" diff --git a/liblttng-ust/lttng-counter-client-percpu-32-modular.c b/liblttng-ust/lttng-counter-client-percpu-32-modular.c index 86fa1164..fc36badc 100644 --- a/liblttng-ust/lttng-counter-client-percpu-32-modular.c +++ b/liblttng-ust/lttng-counter-client-percpu-32-modular.c @@ -11,6 +11,7 @@ #include #include "../libcounter/counter.h" #include "../libcounter/counter-api.h" +#include "lttng-tracer-core.h" static const struct lib_counter_config client_config = { .alloc = COUNTER_ALLOC_PER_CPU, diff --git a/liblttng-ust/lttng-counter-client-percpu-64-modular.c b/liblttng-ust/lttng-counter-client-percpu-64-modular.c index c3851946..b935986f 100644 --- a/liblttng-ust/lttng-counter-client-percpu-64-modular.c +++ b/liblttng-ust/lttng-counter-client-percpu-64-modular.c @@ -11,6 +11,7 @@ #include #include "../libcounter/counter.h" #include "../libcounter/counter-api.h" +#include "lttng-tracer-core.h" static const struct lib_counter_config client_config = { .alloc = COUNTER_ALLOC_PER_CPU, diff --git a/liblttng-ust/lttng-tracer-core.h b/liblttng-ust/lttng-tracer-core.h index e303dd71..6531da40 100644 --- a/liblttng-ust/lttng-tracer-core.h +++ b/liblttng-ust/lttng-tracer-core.h @@ -91,6 +91,13 @@ void lttng_event_notifier_notification_send( struct lttng_event_notifier *event_notifier, const char *stack_data); +LTTNG_HIDDEN +struct lttng_counter_transport *lttng_counter_transport_find(const char *name); +LTTNG_HIDDEN +void lttng_counter_transport_register(struct lttng_counter_transport *transport); +LTTNG_HIDDEN +void lttng_counter_transport_unregister(struct lttng_counter_transport *transport); + #ifdef LTTNG_UST_HAVE_PERF_EVENT void lttng_ust_fixup_perf_counter_tls(void); void lttng_perf_lock(void); -- 2.34.1