X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=ad7848c831627cd87a009db5a1c9e29c41a1f841;hb=edaa143197d094019217dafbe2b291c660d2cf12;hp=c9f98cb79810dd9385e578da5f520c60e8582340;hpb=14641debd03ba299bd06040cb62e0dbdef7fac81;p=lttng-ust.git

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index c9f98cb7..ad7848c8 100644
--- 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 "usterr_signal_safe.h"
-#include "config.h"
+#include <ust/usterr-signal-safe.h>
+#include <ust/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
@@ -48,25 +50,24 @@ 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 */
-};
+} ____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 {
 	/* 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
@@ -80,7 +81,7 @@ struct lib_ring_buffer {
 
 	struct 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
@@ -102,7 +103,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 lib_ring_buffer, self);
+} ____cacheline_aligned;
 
 static inline
 void *channel_get_private(struct channel *chan)