Move ust-events.h private functions to internal

This is an API change but the major SONAME bump to '1' gives us the
opportunity to hide symbols that should have been private from the
start.

Change-Id: Ic797f0b17f9edac5d5b2115428afbd241b1c778b
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 9d6568573d77ab523bff7d5fd3af03a0cd0da4fc..5b18fb452c707adead4f7f9fc621a82fcf23317a 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -371,9 +371,6 @@ struct lttng_ust_field_list {
        struct cds_list_head head;
 };
 
-struct ust_pending_probe;
-struct lttng_event;
-
 /*
  * Bytecode interpreter return value masks.
  */
@@ -667,34 +664,8 @@ struct lttng_counter_transport {
        const struct lib_counter_config *client_config;
 };
 
-struct lttng_session *lttng_session_create(void);
-int lttng_session_enable(struct lttng_session *session);
-int lttng_session_disable(struct lttng_session *session);
-int lttng_session_statedump(struct lttng_session *session);
-void lttng_session_destroy(struct lttng_session *session);
-
-struct lttng_channel *lttng_channel_create(struct lttng_session *session,
-                                      const char *transport_name,
-                                      void *buf_addr,
-                                      size_t subbuf_size, size_t num_subbuf,
-                                      unsigned int switch_timer_interval,
-                                      unsigned int read_timer_interval,
-                                      int **shm_fd, int **wait_fd,
-                                      uint64_t **memory_map_size,
-                                      struct lttng_channel *chan_priv_init);
-
-int lttng_channel_enable(struct lttng_channel *channel);
-int lttng_channel_disable(struct lttng_channel *channel);
-
-void lttng_transport_register(struct lttng_transport *transport);
-void lttng_transport_unregister(struct lttng_transport *transport);
-
 int lttng_probe_register(struct lttng_probe_desc *desc);
 void lttng_probe_unregister(struct lttng_probe_desc *desc);
-void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc);
-int lttng_fix_pending_events(void);
-int lttng_probes_init(void);
-void lttng_probes_exit(void);
 
 /*
  * Can be used by applications that change their procname to clear the ust cached value.
@@ -703,26 +674,9 @@ void lttng_context_procname_reset(void);
 
 struct lttng_transport *lttng_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);
-struct lttng_ust_tracepoint_iter *
-       lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
-int lttng_probes_get_field_list(struct lttng_ust_field_list *list);
-void lttng_probes_prune_field_list(struct lttng_ust_field_list *list);
-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);
-
-struct cds_list_head *lttng_get_probe_list_head(void);
 int lttng_session_active(void);
 
 typedef int (*t_statedump_func_ptr)(struct lttng_session *session);
-void lttng_handle_pending_statedump(void *owner);
-struct cds_list_head *_lttng_get_sessions(void);
-
-struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
-               const struct lttng_enum_desc *enum_desc);
 
 void lttng_ust_dl_update(void *ip);
 

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index dd592082f26da2148015e0f72f3ea3d0a8c61d9d..9e928083f3540c465ce3d186ceda8dbe979e8a6d 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -24,10 +24,10 @@
 #include <ust-fd.h>
 #include <ust-helper.h>
 #include <lttng/ust-error.h>
-#include <lttng/ust-events.h>
 #include <ust-dynamic-type.h>
 #include <usterr-signal-safe.h>
 
+#include "../liblttng-ust/ust-events-internal.h"
 #include "../liblttng-ust/compat.h"
 
 #define USTCOMM_CODE_OFFSET(code)      \

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 72d25bb47ea3e3a05807f7e5cbc94b2ad0e5b482..fb922c7279efdc01a773f412e46ac454c1e84890 100644 (file)
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -65,7 +65,7 @@
 static CDS_LIST_HEAD(sessions);
 static CDS_LIST_HEAD(event_notifier_groups);
 
-struct cds_list_head *_lttng_get_sessions(void)
+struct cds_list_head *lttng_get_sessions(void)
 {
        return &sessions;
 }
@@ -1083,7 +1083,7 @@ void probe_provider_event_for_each(struct lttng_probe_desc *provider_desc,
        unsigned int i;
 
        /* Get handle on list of sessions. */
-       sessionsp = _lttng_get_sessions();
+       sessionsp = lttng_get_sessions();
 
        /*
         * Iterate over all events in the probe provider descriptions and

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 40153663fa613cb0f6c609a64200ecbcb00d6861..5d9cdc0a703ce894009f117e87a5ea32dc0aa1e2 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -8,7 +8,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <lttng/ust-events.h>
+
+#include <ust-events-internal.h>
 #include "ust-bitfield.h"
 #include "ust-compat.h"
 #include "clock.h"

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index b3f0ac44276b03e96cbb2a321a1b3dff471da0f2..305c8655806a089870467506446f1b95469a28a2 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -8,7 +8,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <lttng/ust-events.h>
+
+#include <ust-events-internal.h>
 #include "ust-bitfield.h"
 #include "ust-compat.h"
 #include "lttng-tracer.h"

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 9d48e59ba24fadaede0774aa3fb130d1286aaa98..2b3158d4e70d15b41055e12bfc03cec0269089df 100644 (file)
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -23,6 +23,7 @@
 #include "jhash.h"
 #include "getenv.h"
 #include "compat.h"
+#include "ust-events-internal.h"
 
 #define TRACEPOINT_DEFINE
 #include "ust_lib.h"                           /* Only define. */
@@ -192,7 +193,7 @@ void trace_statedump_event(tracepoint_cb tp_cb, void *owner, void *priv)
        struct cds_list_head *sessionsp;
        struct lttng_session *session;
 
-       sessionsp = _lttng_get_sessions();
+       sessionsp = lttng_get_sessions();
        cds_list_for_each_entry(session, sessionsp, node) {
                if (session->owner != owner)
                        continue;

diff --git a/liblttng-ust/ust-events-internal.h b/liblttng-ust/ust-events-internal.h
index 1305a61f6c5925c1b654995771a4f09901b74e90..70249cb0358078b07e2ac0a659739812354baa6a 100644 (file)
--- a/liblttng-ust/ust-events-internal.h
+++ b/liblttng-ust/ust-events-internal.h
@@ -247,6 +247,9 @@ int lttng_event_notifier_enabler_attach_exclusion(
                struct lttng_event_notifier_enabler *event_notifier_enabler,
                struct lttng_ust_excluder_node **excluder);
 
+LTTNG_HIDDEN
+void lttng_free_event_filter_runtime(struct lttng_event *event);
+
 LTTNG_HIDDEN
 void lttng_free_event_notifier_filter_runtime(
                struct lttng_event_notifier *event_notifier);
@@ -296,4 +299,72 @@ void lttng_perf_counter_exit(void)
 }
 #endif /* #else #ifdef HAVE_PERF_EVENT */
 
+LTTNG_HIDDEN
+int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
+LTTNG_HIDDEN
+void lttng_probes_prune_event_list(struct lttng_ust_tracepoint_list *list);
+
+LTTNG_HIDDEN
+int lttng_probes_get_field_list(struct lttng_ust_field_list *list);
+LTTNG_HIDDEN
+void lttng_probes_prune_field_list(struct lttng_ust_field_list *list);
+
+LTTNG_HIDDEN
+struct lttng_ust_tracepoint_iter *
+       lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
+LTTNG_HIDDEN
+struct lttng_ust_field_iter *
+       lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list);
+
+LTTNG_HIDDEN
+struct lttng_session *lttng_session_create(void);
+LTTNG_HIDDEN
+int lttng_session_enable(struct lttng_session *session);
+LTTNG_HIDDEN
+int lttng_session_disable(struct lttng_session *session);
+LTTNG_HIDDEN
+int lttng_session_statedump(struct lttng_session *session);
+LTTNG_HIDDEN
+void lttng_session_destroy(struct lttng_session *session);
+
+LTTNG_HIDDEN
+struct cds_list_head *lttng_get_sessions(void);
+
+LTTNG_HIDDEN
+void lttng_handle_pending_statedump(void *owner);
+
+LTTNG_HIDDEN
+struct lttng_channel *lttng_channel_create(struct lttng_session *session,
+                                      const char *transport_name,
+                                      void *buf_addr,
+                                      size_t subbuf_size, size_t num_subbuf,
+                                      unsigned int switch_timer_interval,
+                                      unsigned int read_timer_interval,
+                                      int **shm_fd, int **wait_fd,
+                                      uint64_t **memory_map_size,
+                                      struct lttng_channel *chan_priv_init);
+
+LTTNG_HIDDEN
+int lttng_channel_enable(struct lttng_channel *channel);
+LTTNG_HIDDEN
+int lttng_channel_disable(struct lttng_channel *channel);
+
+LTTNG_HIDDEN
+void lttng_transport_register(struct lttng_transport *transport);
+LTTNG_HIDDEN
+void lttng_transport_unregister(struct lttng_transport *transport);
+
+LTTNG_HIDDEN
+void lttng_probe_provider_unregister_events(struct lttng_probe_desc *desc);
+
+LTTNG_HIDDEN
+int lttng_fix_pending_events(void);
+
+LTTNG_HIDDEN
+struct cds_list_head *lttng_get_probe_list_head(void);
+
+LTTNG_HIDDEN
+struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_session *session,
+               const struct lttng_enum_desc *enum_desc);
+
 #endif /* _LTTNG_UST_EVENTS_INTERNAL_H */