X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=76ad7ff5beece42cd492a2f7da27d8301ea29336;hb=e095d8031307428069e549360284388e06683293;hp=d1a3d200be7130076805a2c0ef019b6054bf281f;hpb=a6352fd40a2090fd883a6c369144bf405c9e9ec4;p=lttng-ust.git

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index d1a3d200..76ad7ff5 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -20,14 +20,13 @@
 
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
-#include <urcu/ref.h>
 
 #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
@@ -51,8 +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 */
-	struct urcu_ref ref;			/* Reference count */
-	DECLARE_SHMP(struct shm_header, shm_header);
 } ____cacheline_aligned;
 
 /* Per-subbuffer commit counters used on the hot path */
@@ -90,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 */
@@ -106,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