Remove unused libringbuffer/ring_buffer_abi.c

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

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 120e1f4bbbe06b94cea844fb5b654b60c81e04a6..93131616f613050d3a7c0707ce486219ec6fc85f 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -21,10 +21,10 @@
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
 
-#include "ust/core.h"
+#include "lttng/core.h"
 
-#include <ust/usterr-signal-safe.h>
-#include <ust/ringbuffer-config.h>
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ringbuffer-config.h>
 #include "backend_types.h"
 #include "shm_internal.h"
 
@@ -48,6 +48,7 @@ struct channel {
        unsigned long read_timer_interval;      /* Reader wakeup (jiffies) */
        //wait_queue_head_t read_wait;          /* reader wait queue */
        int finalized;                          /* Has channel been finalized */
+       size_t priv_data_offset;
        /*
         * Associated backend contains a variable-length array. Needs to
         * be last member.
@@ -114,7 +115,7 @@ struct lttng_ust_lib_ring_buffer {
 static inline
 void *channel_get_private(struct channel *chan)
 {
-       return chan->backend.priv;
+       return ((char *) chan) + chan->priv_data_offset;
 }
 
 /*
@@ -125,7 +126,7 @@ void *channel_get_private(struct channel *chan)
 #define CHAN_WARN_ON(c, cond)                                          \
        ({                                                              \
                struct channel *__chan;                                 \
-               int _____ret = unlikely(cond);                          \
+               int _____ret = caa_unlikely(cond);                              \
                if (_____ret) {                                         \
                        if (__same_type(*(c), struct channel_backend))  \
                                __chan = caa_container_of((void *) (c), \