Move include/ust/ to include/lttng/

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

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 974f782e0dc86b3ed3903ec861ede6754504fbd9..7d9166e0529c75d16364c796cb0ee05a05247b75 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"
 
@@ -44,12 +44,15 @@ struct channel {
                                                 * subbuffer index.
                                                 */
 
-       struct channel_backend backend;         /* Associated backend */
-
        unsigned long switch_timer_interval;    /* Buffer flush (jiffies) */
        unsigned long read_timer_interval;      /* Reader wakeup (jiffies) */
        //wait_queue_head_t read_wait;          /* reader wait queue */
        int finalized;                          /* Has channel been finalized */
+       /*
+        * Associated backend contains a variable-length array. Needs to
+        * be last member.
+        */
+       struct channel_backend backend;         /* Associated backend */
 } ____cacheline_aligned;
 
 /* Per-subbuffer commit counters used on the hot path */
@@ -64,7 +67,7 @@ struct commit_counters_cold {
 } ____cacheline_aligned;
 
 /* ring buffer state */
-struct lib_ring_buffer {
+struct lttng_ust_lib_ring_buffer {
        /* First 32 bytes cache-hot cacheline */
        union v_atomic offset;          /* Current offset in the buffer */
        DECLARE_SHMP(struct commit_counters_hot, commit_hot);
@@ -79,7 +82,7 @@ struct lib_ring_buffer {
                                         * Last timestamp written in the buffer.
                                         */
 
-       struct lib_ring_buffer_backend backend; /* Associated backend */
+       struct lttng_ust_lib_ring_buffer_backend backend;       /* Associated backend */
 
        DECLARE_SHMP(struct commit_counters_cold, commit_cold);
                                        /* Commit count per sub-buffer */
@@ -87,6 +90,7 @@ struct lib_ring_buffer {
                                         * Active readers count
                                         * standard atomic access (shared)
                                         */
+       long active_shadow_readers;
                                        /* Dropped records */
        union v_atomic records_lost_full;       /* Buffer full */
        union v_atomic records_lost_wrap;       /* Nested wrap-around */
@@ -103,6 +107,8 @@ struct lib_ring_buffer {
        int get_subbuf:1;               /* Sub-buffer being held by reader */
        int switch_timer_enabled:1;     /* Protected by ring_buffer_nohz_lock */
        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;
 
 static inline
@@ -113,13 +119,13 @@ void *channel_get_private(struct channel *chan)
 
 /*
  * Issue warnings and disable channels upon internal error.
- * Can receive struct lib_ring_buffer or struct lib_ring_buffer_backend
+ * Can receive struct lttng_ust_lib_ring_buffer or struct lttng_ust_lib_ring_buffer_backend
  * parameters.
  */
 #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), \