Namespace 'struct channel' under 'lttng_ust_lib_ring_buffer_'

[lttng-ust.git] / libringbuffer / frontend.h

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 9bc22df887228dd2a49d68dbedf4bf9ae7800b0f..de924a0a8af8f090ed9e1caf9ecb61d02da17b2c 100644 (file)
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -18,7 +18,6 @@
 #include <urcu/uatomic.h>
 
 #include "smp.h"
-#include "ust-helper.h"
 
 /* Internal helpers */
 #include "frontend_internal.h"
@@ -41,7 +40,7 @@
  * private data area.
  */
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern
 struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buffer_config *config,
                                const char *name,
@@ -60,9 +59,10 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
  * channel_destroy finalizes all channel's buffers, waits for readers to
  * release all references, and destroys the channel.
  */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern
-void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
+void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
+               struct lttng_ust_shm_handle *handle,
                int consumer);
 
 
@@ -77,41 +77,46 @@ void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
 #define for_each_channel_cpu(cpu, chan)                                        \
        for_each_possible_cpu(cpu)
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
                                const struct lttng_ust_lib_ring_buffer_config *config,
-                               struct channel *chan, int cpu,
+                               struct lttng_ust_lib_ring_buffer_channel *chan, int cpu,
                                struct lttng_ust_shm_handle *handle,
                                int *shm_fd, int *wait_fd,
                                int *wakeup_fd,
                                uint64_t *memory_map_size);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern
 int ring_buffer_channel_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-                       struct channel *chan,
+                       struct lttng_ust_lib_ring_buffer_channel *chan,
                        struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern
 int ring_buffer_channel_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-                       struct channel *chan,
+                       struct lttng_ust_lib_ring_buffer_channel *chan,
                        struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern
 int ring_buffer_stream_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-               struct channel *chan,
+               struct lttng_ust_lib_ring_buffer_channel *chan,
                struct lttng_ust_shm_handle *handle,
                int cpu);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern
 int ring_buffer_stream_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-               struct channel *chan,
+               struct lttng_ust_lib_ring_buffer_channel *chan,
                struct lttng_ust_shm_handle *handle,
                int cpu);
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_open_read(struct lttng_ust_lib_ring_buffer *buf,
                                     struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_release_read(struct lttng_ust_lib_ring_buffer *buf,
                                         struct lttng_ust_shm_handle *handle);
 
@@ -119,33 +124,35 @@ extern void lib_ring_buffer_release_read(struct lttng_ust_lib_ring_buffer *buf,
  * Initialize signals for ring buffer. Should be called early e.g. by
  * main() in the program to affect all threads.
  */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 void lib_ringbuffer_signal_init(void);
 
 /*
  * Read sequence: snapshot, many get_subbuf/put_subbuf, move_consumer.
  */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_snapshot(struct lttng_ust_lib_ring_buffer *buf,
                                    unsigned long *consumed,
                                    unsigned long *produced,
                                    struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_snapshot_sample_positions(
                                    struct lttng_ust_lib_ring_buffer *buf,
                                    unsigned long *consumed,
                                    unsigned long *produced,
                                    struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_move_consumer(struct lttng_ust_lib_ring_buffer *buf,
                                          unsigned long consumed_new,
                                          struct lttng_ust_shm_handle *handle);
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_get_subbuf(struct lttng_ust_lib_ring_buffer *buf,
                                      unsigned long consumed,
                                      struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_put_subbuf(struct lttng_ust_lib_ring_buffer *buf,
                                       struct lttng_ust_shm_handle *handle);
 
@@ -170,7 +177,7 @@ static inline
 void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
                                     struct lttng_ust_shm_handle *handle)
 {
-       struct channel *chan;
+       struct lttng_ust_lib_ring_buffer_channel *chan;
 
        chan = shmp(handle, buf->backend.chan);
        if (!chan)
@@ -180,9 +187,10 @@ void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
                        handle);
 }
 
-LTTNG_HIDDEN
-extern void channel_reset(struct channel *chan);
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
+extern void channel_reset(struct lttng_ust_lib_ring_buffer_channel *chan);
+
+__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_reset(struct lttng_ust_lib_ring_buffer *buf,
                                  struct lttng_ust_shm_handle *handle);
 
@@ -217,13 +225,13 @@ int lib_ring_buffer_is_finalized(const struct lttng_ust_lib_ring_buffer_config *
 }
 
 static inline
-int lib_ring_buffer_channel_is_finalized(const struct channel *chan)
+int lib_ring_buffer_channel_is_finalized(const struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return chan->finalized;
 }
 
 static inline
-int lib_ring_buffer_channel_is_disabled(const struct channel *chan)
+int lib_ring_buffer_channel_is_disabled(const struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return uatomic_read(&chan->record_disabled);
 }