Fix: pass private data to context callbacks

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

diff --git a/libringbuffer/frontend_internal.h b/libringbuffer/frontend_internal.h
index e6569b28919f3dab1b25f5b3b40ede2dd82f3e0b..7d905d4bc55fee4d951bbfcfe5daf5104afea20c 100644 (file)
--- a/libringbuffer/frontend_internal.h
+++ b/libringbuffer/frontend_internal.h
@@ -17,8 +17,10 @@
 #include <stdint.h>
 #include <pthread.h>
 
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include "ringbuffer-config.h"
 #include "backend_types.h"
+#include "backend_internal.h"
 #include "frontend_types.h"
 #include "shm.h"
 
@@ -145,18 +147,17 @@ int last_tsc_overflow(const struct lttng_ust_lib_ring_buffer_config *config,
 }
 #endif
 
-__attribute__((visibility("hidden")))
 extern
 int lib_ring_buffer_reserve_slow(struct lttng_ust_lib_ring_buffer_ctx *ctx,
-               void *client_ctx);
+               void *client_ctx)
+       __attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern
 void lib_ring_buffer_switch_slow(struct lttng_ust_lib_ring_buffer *buf,
                                 enum switch_mode mode,
-                                struct lttng_ust_shm_handle *handle);
+                                struct lttng_ust_shm_handle *handle)
+       __attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 void lib_ring_buffer_check_deliver_slow(const struct lttng_ust_lib_ring_buffer_config *config,
                                   struct lttng_ust_lib_ring_buffer *buf,
                                   struct lttng_ust_lib_ring_buffer_channel *chan,
@@ -164,7 +165,8 @@ void lib_ring_buffer_check_deliver_slow(const struct lttng_ust_lib_ring_buffer_c
                                   unsigned long commit_count,
                                   unsigned long idx,
                                   struct lttng_ust_shm_handle *handle,
-                                  uint64_t tsc);
+                                  uint64_t tsc)
+       __attribute__((visibility("hidden")));
 
 /* Buffer write helpers */
 
@@ -320,13 +322,14 @@ void lib_ring_buffer_check_deliver(const struct lttng_ust_lib_ring_buffer_config
  * useful for crash dump.
  */
 static inline
-void lib_ring_buffer_write_commit_counter(const struct lttng_ust_lib_ring_buffer_config *config,
-                                         struct lttng_ust_lib_ring_buffer *buf,
-                                         struct lttng_ust_lib_ring_buffer_channel *chan,
-                                         unsigned long buf_offset,
-                                         unsigned long commit_count,
-                                         struct lttng_ust_shm_handle *handle,
-                                         struct commit_counters_hot *cc_hot)
+void lib_ring_buffer_write_commit_counter(
+               const struct lttng_ust_lib_ring_buffer_config *config,
+               struct lttng_ust_lib_ring_buffer *buf __attribute__((unused)),
+               struct lttng_ust_lib_ring_buffer_channel *chan,
+               unsigned long buf_offset,
+               unsigned long commit_count,
+               struct lttng_ust_shm_handle *handle __attribute__((unused)),
+               struct commit_counters_hot *cc_hot)
 {
        unsigned long commit_seq_old;
 
@@ -347,18 +350,18 @@ void lib_ring_buffer_write_commit_counter(const struct lttng_ust_lib_ring_buffer
                v_set(config, &cc_hot->seq, commit_count);
 }
 
-__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_create(struct lttng_ust_lib_ring_buffer *buf,
                                  struct channel_backend *chanb, int cpu,
                                  struct lttng_ust_shm_handle *handle,
-                                 struct shm_object *shmobj);
+                                 struct shm_object *shmobj)
+       __attribute__((visibility("hidden")));
 
-__attribute__((visibility("hidden")))
 extern void lib_ring_buffer_free(struct lttng_ust_lib_ring_buffer *buf,
-                                struct lttng_ust_shm_handle *handle);
+                                struct lttng_ust_shm_handle *handle)
+       __attribute__((visibility("hidden")));
 
 /* Keep track of trap nesting inside ring buffer code */
-__attribute__((visibility("hidden")))
-extern DECLARE_URCU_TLS(unsigned int, lib_ring_buffer_nesting);
+extern DECLARE_URCU_TLS(unsigned int, lib_ring_buffer_nesting)
+       __attribute__((visibility("hidden")));
 
 #endif /* _LTTNG_RING_BUFFER_FRONTEND_INTERNAL_H */