X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fbackend_types.h;h=a77c4c9559a3dd7ef998736a46d1b0d13243c969;hb=c1fca4572d4458b2e6e96752f9efc595c5f72405;hp=1d301de2e178f8bc992ceb842ff8a4522f359618;hpb=852c29366c62c78f78af261f0287afcd92eae6b5;p=lttng-ust.git

diff --git a/libringbuffer/backend_types.h b/libringbuffer/backend_types.h
index 1d301de2..a77c4c95 100644
--- a/libringbuffer/backend_types.h
+++ b/libringbuffer/backend_types.h
@@ -11,23 +11,17 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#include <linux/cpumask.h>
-#include <linux/types.h>
+#include "shm_internal.h"
 
-struct lib_ring_buffer_backend_page {
-	void *virt;			/* page virtual address (cached) */
-	struct page *page;		/* pointer to page structure */
-};
-
-struct lib_ring_buffer_backend_pages {
+struct lttng_ust_lib_ring_buffer_backend_pages {
 	unsigned long mmap_offset;	/* offset of the subbuffer in mmap */
 	union v_atomic records_commit;	/* current records committed count */
 	union v_atomic records_unread;	/* records to read */
 	unsigned long data_size;	/* Amount of data to read from subbuf */
-	struct lib_ring_buffer_backend_page p[];
+	DECLARE_SHMP(char, p);		/* Backing memory map */
 };
 
-struct lib_ring_buffer_backend_subbuffer {
+struct lttng_ust_lib_ring_buffer_backend_subbuffer {
 	/* Identifier for subbuf backend pages. Exchanged atomically. */
 	unsigned long id;		/* backend subbuffer identifier */
 };
@@ -36,26 +30,34 @@ struct lib_ring_buffer_backend_subbuffer {
  * Forward declaration of frontend-specific channel and ring_buffer.
  */
 struct channel;
-struct lib_ring_buffer;
+struct lttng_ust_lib_ring_buffer;
+
+struct lttng_ust_lib_ring_buffer_backend_pages_shmp {
+	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages, shmp);
+};
 
-struct lib_ring_buffer_backend {
+struct lttng_ust_lib_ring_buffer_backend {
 	/* Array of ring_buffer_backend_subbuffer for writer */
-	struct lib_ring_buffer_backend_subbuffer *buf_wsb;
+	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_subbuffer, buf_wsb);
 	/* ring_buffer_backend_subbuffer for reader */
-	struct lib_ring_buffer_backend_subbuffer buf_rsb;
+	struct lttng_ust_lib_ring_buffer_backend_subbuffer buf_rsb;
 	/*
 	 * Pointer array of backend pages, for whole buffer.
 	 * Indexed by ring_buffer_backend_subbuffer identifier (id) index.
 	 */
-	struct lib_ring_buffer_backend_pages **array;
-	unsigned int num_pages_per_subbuf;
+	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages_shmp, array);
+	DECLARE_SHMP(char, memory_map);	/* memory mapping */
 
-	struct channel *chan;		/* Associated channel */
+	DECLARE_SHMP(struct channel, chan);	/* Associated channel */
 	int cpu;			/* This buffer's cpu. -1 if global. */
 	union v_atomic records_read;	/* Number of records read */
 	unsigned int allocated:1;	/* Bool: is buffer allocated ? */
 };
 
+struct lttng_ust_lib_ring_buffer_shmp {
+	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, shmp); /* Channel per-cpu buffers */
+};
+
 struct channel_backend {
 	unsigned long buf_size;		/* Size of the buffer */
 	unsigned long subbuf_size;	/* Sub-buffer size */
@@ -66,15 +68,12 @@ struct channel_backend {
 					 */
 	unsigned int buf_size_order;	/* Order of buffer size */
 	int extra_reader_sb:1;		/* Bool: has extra reader subbuffer */
-	struct lib_ring_buffer *buf;	/* Channel per-cpu buffers */
-
 	unsigned long num_subbuf;	/* Number of sub-buffers for writer */
 	u64 start_tsc;			/* Channel creation TSC value */
 	void *priv;			/* Client-specific information */
-	struct notifier_block cpu_hp_notifier;	 /* CPU hotplug notifier */
-	const struct lib_ring_buffer_config *config; /* Ring buffer configuration */
-	cpumask_var_t cpumask;		/* Allocated per-cpu buffers cpumask */
+	struct lttng_ust_lib_ring_buffer_config config; /* Ring buffer configuration */
 	char name[NAME_MAX];		/* Channel name */
+	struct lttng_ust_lib_ring_buffer_shmp buf[];
 };
 
 #endif /* _LINUX_RING_BUFFER_BACKEND_TYPES_H */