X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=baf1826321a2934f83b40992464dd2671615a2ef;hb=d672b30f45079019d516dd7fe042b60a248c13a5;hp=59611f2fc4f5d9feb359d53af9144fbfb1688c66;hpb=8d8a24c8565ce6dce7e7bd1045a95d1d2af5e536;p=lttng-ust.git

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 59611f2f..baf18263 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -23,10 +23,10 @@
 
 #include "ust/core.h"
 
-#include "usterr_signal_safe.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
@@ -44,13 +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 */
-	DECLARE_SHMP(struct shm_header, shm_header);
+	/*
+	 * 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 */
@@ -88,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 */
@@ -104,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 lib_ring_buffer, self);
 } ____cacheline_aligned;
 
 static inline