Do not install usterr-signal-safe

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

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 120e1f4bbbe06b94cea844fb5b654b60c81e04a6..32462f6b5725cb5ab1883566ee7bc397e43ad528 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -21,12 +21,11 @@
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
 
-#include "ust/core.h"
-
-#include <ust/usterr-signal-safe.h>
-#include <ust/ringbuffer-config.h>
+#include <lttng/ringbuffer-config.h>
+#include <usterr-signal-safe.h>
 #include "backend_types.h"
 #include "shm_internal.h"
+#include "vatomic.h"
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -48,23 +47,24 @@ 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.
         */
        struct channel_backend backend;         /* Associated backend */
-} ____cacheline_aligned;
+} __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 /* Per-subbuffer commit counters used on the hot path */
 struct commit_counters_hot {
        union v_atomic cc;              /* Commit counter */
        union v_atomic seq;             /* Consecutive commits */
-} ____cacheline_aligned;
+} __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 /* Per-subbuffer commit counters used only on cold paths */
 struct commit_counters_cold {
        union v_atomic cc_sb;           /* Incremented _once_ at sb switch */
-} ____cacheline_aligned;
+} __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 /* ring buffer state */
 struct lttng_ust_lib_ring_buffer {
@@ -109,14 +109,18 @@ struct lttng_ust_lib_ring_buffer {
        int read_timer_enabled:1;       /* Protected by ring_buffer_nohz_lock */
        /* shmp pointer to self */
        DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, self);
-} ____cacheline_aligned;
+} __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 static inline
 void *channel_get_private(struct channel *chan)
 {
-       return chan->backend.priv;
+       return ((char *) chan) + chan->priv_data_offset;
 }
 
+#ifndef __rb_same_type
+#define __rb_same_type(a, b)   __builtin_types_compatible_p(typeof(a), typeof(b))
+#endif
+
 /*
  * Issue warnings and disable channels upon internal error.
  * Can receive struct lttng_ust_lib_ring_buffer or struct lttng_ust_lib_ring_buffer_backend
@@ -125,13 +129,13 @@ 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))  \
+                       if (__rb_same_type(*(c), struct channel_backend))       \
                                __chan = caa_container_of((void *) (c), \
                                                        struct channel, \
                                                        backend);       \
-                       else if (__same_type(*(c), struct channel))     \
+                       else if (__rb_same_type(*(c), struct channel))  \
                                __chan = (void *) (c);                  \
                        else                                            \
                                BUG_ON(1);                              \