From 5287fad0d44dd62029a23d0b44fcd3c95574345a Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 17 Dec 2020 15:33:15 -0500 Subject: [PATCH] Move and hide new time_ns private symbols Change-Id: I47bb61832d59385d2c296b07058dd37f3af335e0 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/lttng/ust-events.h | 2 -- liblttng-ust/context-internal.h | 6 ++++++ liblttng-ust/lttng-context-time-ns.c | 1 + liblttng-ust/lttng-ust-comm.c | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 16c5abb1..c96307a3 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -775,7 +775,6 @@ int lttng_add_ipc_ns_to_ctx(struct lttng_ctx **ctx); int lttng_add_mnt_ns_to_ctx(struct lttng_ctx **ctx); int lttng_add_net_ns_to_ctx(struct lttng_ctx **ctx); int lttng_add_pid_ns_to_ctx(struct lttng_ctx **ctx); -int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx); int lttng_add_user_ns_to_ctx(struct lttng_ctx **ctx); int lttng_add_uts_ns_to_ctx(struct lttng_ctx **ctx); int lttng_add_vuid_to_ctx(struct lttng_ctx **ctx); @@ -792,7 +791,6 @@ void lttng_context_ipc_ns_reset(void); void lttng_context_mnt_ns_reset(void); void lttng_context_net_ns_reset(void); void lttng_context_pid_ns_reset(void); -void lttng_context_time_ns_reset(void); void lttng_context_user_ns_reset(void); void lttng_context_uts_ns_reset(void); void lttng_context_vuid_reset(void); diff --git a/liblttng-ust/context-internal.h b/liblttng-ust/context-internal.h index 85fcb8e4..18a78006 100644 --- a/liblttng-ust/context-internal.h +++ b/liblttng-ust/context-internal.h @@ -31,4 +31,10 @@ LTTNG_HIDDEN int lttng_context_init_all(struct lttng_ctx **ctx); +LTTNG_HIDDEN +void lttng_context_time_ns_reset(void); + +LTTNG_HIDDEN +int lttng_add_time_ns_to_ctx(struct lttng_ctx **ctx); + #endif /* _LTTNG_UST_CONTEXT_INTERNAL_H */ diff --git a/liblttng-ust/lttng-context-time-ns.c b/liblttng-ust/lttng-context-time-ns.c index dda8fb37..a2cd5f64 100644 --- a/liblttng-ust/lttng-context-time-ns.c +++ b/liblttng-ust/lttng-context-time-ns.c @@ -33,6 +33,7 @@ #include #include "lttng-tracer-core.h" #include "ns.h" +#include "context-internal.h" /* diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c index f45097b0..347a2e09 100644 --- a/liblttng-ust/lttng-ust-comm.c +++ b/liblttng-ust/lttng-ust-comm.c @@ -63,6 +63,7 @@ #include "../libringbuffer/getcpu.h" #include "getenv.h" #include "ust-events-internal.h" +#include "context-internal.h" /* Concatenate lttng ust shared library name with its major version number. */ #define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." __ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR) -- 2.34.1