Check for num cpus

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

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index b50b284610692c538073f0089bf1205320ddad84..76ad7ff5beece42cd492a2f7da27d8301ea29336 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -23,10 +23,10 @@
 
 #include "ust/core.h"
 
-#include "usterr_signal_safe.h"
-#include "config.h"
+#include <ust/usterr-signal-safe.h>
+#include <ust/ringbuffer-config.h>
 #include "backend_types.h"
-#include "shm.h"
+#include "shm_internal.h"
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
@@ -50,7 +50,6 @@ 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 */
-       DECLARE_SHMP(struct shm_header, shm_header);
 } ____cacheline_aligned;
 
 /* Per-subbuffer commit counters used on the hot path */
@@ -88,6 +87,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 */
@@ -104,6 +104,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 lib_ring_buffer, self);
 } ____cacheline_aligned;
 
 static inline