Fix: pass private data to context callbacks

[lttng-ust.git] / libringbuffer / ringbuffer-config.h

diff --git a/libringbuffer/ringbuffer-config.h b/libringbuffer/ringbuffer-config.h
index badf7566cf0329756c689a5ea9ce921c9a4fbf2b..2e10de03366ca772356820fc7f53a35099afd08b 100644 (file)
--- a/libringbuffer/ringbuffer-config.h
+++ b/libringbuffer/ringbuffer-config.h
@@ -16,14 +16,14 @@
 #include <urcu/arch.h>
 #include <string.h>
 
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-tracer.h>
 
 struct lttng_ust_lib_ring_buffer;
 struct lttng_ust_lib_ring_buffer_channel;
 struct lttng_ust_lib_ring_buffer_config;
-struct lttng_ust_lib_ring_buffer_ctx;
+struct lttng_ust_lib_ring_buffer_ctx_private;
 struct lttng_ust_shm_handle;
 
 /*
@@ -221,14 +221,16 @@ struct lttng_ust_lib_ring_buffer_config {
  * lib_ring_buffer_check_config() returns 0 on success.
  * Used internally to check for valid configurations at channel creation.
  */
-static inline lttng_ust_notrace
+static inline
 int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config,
                             unsigned int switch_timer_interval,
-                            unsigned int read_timer_interval);
+                            unsigned int read_timer_interval)
+       lttng_ust_notrace;
+
 static inline
 int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config,
                             unsigned int switch_timer_interval,
-                            unsigned int read_timer_interval)
+                            unsigned int read_timer_interval __attribute__((unused)))
 {
        if (config->alloc == RING_BUFFER_ALLOC_GLOBAL
            && config->sync == RING_BUFFER_SYNC_PER_CPU