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 c9f98cb79810dd9385e578da5f520c60e8582340..7d9166e0529c75d16364c796cb0ee05a05247b75 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -16,15 +16,17 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
+#include <string.h>
+
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
-#include <urcu/ref.h>
 
-#include "ust/core.h"
+#include "lttng/core.h"
 
-#include "usterr_signal_safe.h"
-#include "config.h"
+#include <lttng/usterr-signal-safe.h>
+#include <lttng/ringbuffer-config.h>
 #include "backend_types.h"
+#include "shm_internal.h"
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -42,31 +44,33 @@ 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 */
-       struct urcu_ref ref;                    /* Reference count */
-};
+       /*
+        * 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 */
 struct commit_counters_hot {
        union v_atomic cc;              /* Commit counter */
        union v_atomic seq;             /* Consecutive commits */
-};
+} ____cacheline_aligned;
 
 /* 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;
 
 /* 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 */
-       struct commit_counters_hot *commit_hot;
+       DECLARE_SHMP(struct commit_counters_hot, commit_hot);
                                        /* Commit count per sub-buffer */
        long consumed;                  /*
                                         * Current offset in the buffer
@@ -78,14 +82,15 @@ 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 */
 
-       struct commit_counters_cold *commit_cold;
+       DECLARE_SHMP(struct commit_counters_cold, commit_cold);
                                        /* Commit count per sub-buffer */
        long active_readers;            /*
                                         * 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 */
@@ -102,7 +107,9 @@ 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
 void *channel_get_private(struct channel *chan)
@@ -112,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), \