X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fringbuffer%2Fbackend_types.h;h=337f1cda9ba26219a34f01065b5b4a3c14a31a1f;hb=9497697f1a6fe19731aaf4d35f465388a18f076a;hp=37a3bb8c2a363ccb25859409598da73e7705fe35;hpb=2df37e95fa4303ecc0db41334452665491533641;p=lttng-modules.git

diff --git a/include/ringbuffer/backend_types.h b/include/ringbuffer/backend_types.h
index 37a3bb8c..337f1cda 100644
--- a/include/ringbuffer/backend_types.h
+++ b/include/ringbuffer/backend_types.h
@@ -15,25 +15,25 @@
 #include <lttng/kernel-version.h>
 #include <lttng/cpuhotplug.h>
 
-struct lib_ring_buffer_backend_page {
+struct lttng_kernel_ring_buffer_backend_page {
 	void *virt;			/* page virtual address (cached) */
 	unsigned long pfn;		/* page frame number */
 };
 
-struct lib_ring_buffer_backend_pages {
+struct lttng_kernel_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[];
+	struct lttng_kernel_ring_buffer_backend_page p[];
 };
 
-struct lib_ring_buffer_backend_subbuffer {
+struct lttng_kernel_ring_buffer_backend_subbuffer {
 	/* Identifier for subbuf backend pages. Exchanged atomically. */
 	unsigned long id;		/* backend subbuffer identifier */
 };
 
-struct lib_ring_buffer_backend_counts {
+struct lttng_kernel_ring_buffer_backend_counts {
 	/*
 	 * Counter specific to the sub-buffer location within the ring buffer.
 	 * The actual sequence number of the packet within the entire ring
@@ -46,24 +46,24 @@ struct lib_ring_buffer_backend_counts {
 /*
  * Forward declaration of frontend-specific channel and ring_buffer.
  */
-struct channel;
-struct lib_ring_buffer;
+struct lttng_kernel_ring_buffer_channel;
+struct lttng_kernel_ring_buffer;
 
-struct lib_ring_buffer_backend {
+struct lttng_kernel_ring_buffer_backend {
 	/* Array of ring_buffer_backend_subbuffer for writer */
-	struct lib_ring_buffer_backend_subbuffer *buf_wsb;
+	struct lttng_kernel_ring_buffer_backend_subbuffer *buf_wsb;
 	/* ring_buffer_backend_subbuffer for reader */
-	struct lib_ring_buffer_backend_subbuffer buf_rsb;
+	struct lttng_kernel_ring_buffer_backend_subbuffer buf_rsb;
 	/* Array of lib_ring_buffer_backend_counts for the packet counter */
-	struct lib_ring_buffer_backend_counts *buf_cnt;
+	struct lttng_kernel_ring_buffer_backend_counts *buf_cnt;
 	/*
 	 * Pointer array of backend pages, for whole buffer.
 	 * Indexed by ring_buffer_backend_subbuffer identifier (id) index.
 	 */
-	struct lib_ring_buffer_backend_pages **array;
+	struct lttng_kernel_ring_buffer_backend_pages **array;
 	unsigned int num_pages_per_subbuf;
 
-	struct channel *chan;		/* Associated channel */
+	struct lttng_kernel_ring_buffer_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;	/* is buffer allocated ? */
@@ -79,14 +79,14 @@ struct channel_backend {
 					 */
 	unsigned int buf_size_order;	/* Order of buffer size */
 	unsigned int extra_reader_sb:1;	/* has extra reader subbuffer ? */
-	struct lib_ring_buffer *buf;	/* Channel per-cpu buffers */
+	struct lttng_kernel_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 */
 	void *priv_ops;			/* Client-specific ops pointer */
 	void (*release_priv_ops)(void *priv_ops);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,10,0))
 	struct lttng_cpuhp_node cpuhp_prepare;	/* CPU hotplug prepare */
 #else
 	struct notifier_block cpu_hp_notifier;	 /* CPU hotplug notifier */
@@ -96,7 +96,7 @@ struct channel_backend {
 	 * source config can vanish before the last reference to this
 	 * channel's streams is released.
 	 */
-	struct lib_ring_buffer_config config; /* Ring buffer configuration */
+	struct lttng_kernel_ring_buffer_config config; /* Ring buffer configuration */
 	cpumask_var_t cpumask;		/* Allocated per-cpu buffers cpumask */
 	char name[NAME_MAX];		/* Channel name */
 };