X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Fringbuffer%2Fring_buffer_vfs.c;h=a5ac0e432539df7907f8944f19d6dfcce2817a4d;hb=6768203a5a4f1e8ef32629d3b25e83b91e3645fe;hp=e5d6a70177467d55555bd125a5a748a78ab7c9de;hpb=cfa6cc1d0f01c2cfcc1a679abf3a6572d411c309;p=lttng-modules.git

diff --git a/src/lib/ringbuffer/ring_buffer_vfs.c b/src/lib/ringbuffer/ring_buffer_vfs.c
index e5d6a701..a5ac0e43 100644
--- a/src/lib/ringbuffer/ring_buffer_vfs.c
+++ b/src/lib/ringbuffer/ring_buffer_vfs.c
@@ -34,7 +34,7 @@ static int compat_put_ulong(compat_ulong_t val, unsigned long arg)
  * there if we ever want to implement an inode with open() operation.
  */
 int lib_ring_buffer_open(struct inode *inode, struct file *file,
-		struct lib_ring_buffer *buf)
+		struct lttng_kernel_ring_buffer *buf)
 {
 	int ret;
 
@@ -67,14 +67,14 @@ EXPORT_SYMBOL_GPL(lib_ring_buffer_open);
 static
 int vfs_lib_ring_buffer_open(struct inode *inode, struct file *file)
 {
-	struct lib_ring_buffer *buf = inode->i_private;
+	struct lttng_kernel_ring_buffer *buf = inode->i_private;
 
 	file->private_data = buf;
 	return lib_ring_buffer_open(inode, file, buf);
 }
 
 int lib_ring_buffer_release(struct inode *inode, struct file *file,
-		struct lib_ring_buffer *buf)
+		struct lttng_kernel_ring_buffer *buf)
 {
 	lib_ring_buffer_release_read(buf);
 
@@ -92,17 +92,17 @@ EXPORT_SYMBOL_GPL(lib_ring_buffer_release);
 static
 int vfs_lib_ring_buffer_release(struct inode *inode, struct file *file)
 {
-	struct lib_ring_buffer *buf = file->private_data;
+	struct lttng_kernel_ring_buffer *buf = file->private_data;
 
 	return lib_ring_buffer_release(inode, file, buf);
 }
 
 unsigned int lib_ring_buffer_poll(struct file *filp, poll_table *wait,
-		struct lib_ring_buffer *buf)
+		struct lttng_kernel_ring_buffer *buf)
 {
 	unsigned int mask = 0;
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	int finalized, disabled;
 
 	if (filp->f_mode & FMODE_READ) {
@@ -162,32 +162,32 @@ EXPORT_SYMBOL_GPL(lib_ring_buffer_poll);
 static
 unsigned int vfs_lib_ring_buffer_poll(struct file *filp, poll_table *wait)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
 
 	return lib_ring_buffer_poll(filp, wait, buf);
 }
 
 long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
-		unsigned long arg, struct lib_ring_buffer *buf)
+		unsigned long arg, struct lttng_kernel_ring_buffer *buf)
 {
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 
 	if (lib_ring_buffer_channel_is_disabled(chan))
 		return -EIO;
 
 	switch (cmd) {
-	case RING_BUFFER_SNAPSHOT:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_SNAPSHOT:
 		return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
 					    &buf->prod_snapshot);
-	case RING_BUFFER_SNAPSHOT_SAMPLE_POSITIONS:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_SNAPSHOT_SAMPLE_POSITIONS:
 		return lib_ring_buffer_snapshot_sample_positions(buf,
 				&buf->cons_snapshot, &buf->prod_snapshot);
-	case RING_BUFFER_SNAPSHOT_GET_CONSUMED:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_SNAPSHOT_GET_CONSUMED:
 		return put_ulong(buf->cons_snapshot, arg);
-	case RING_BUFFER_SNAPSHOT_GET_PRODUCED:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_SNAPSHOT_GET_PRODUCED:
 		return put_ulong(buf->prod_snapshot, arg);
-	case RING_BUFFER_GET_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_SUBBUF:
 	{
 		unsigned long uconsume;
 		long ret;
@@ -202,11 +202,11 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
 		}
 		return ret;
 	}
-	case RING_BUFFER_PUT_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_PUT_SUBBUF:
 		lib_ring_buffer_put_subbuf(buf);
 		return 0;
 
-	case RING_BUFFER_GET_NEXT_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF:
 	{
 		long ret;
 
@@ -217,13 +217,13 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
 		}
 		return ret;
 	}
-	case RING_BUFFER_PUT_NEXT_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_PUT_NEXT_SUBBUF:
 		lib_ring_buffer_put_next_subbuf(buf);
 		return 0;
-	case RING_BUFFER_GET_SUBBUF_SIZE:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_SUBBUF_SIZE:
 		return put_ulong(lib_ring_buffer_get_read_data_size(config, buf),
 				 arg);
-	case RING_BUFFER_GET_PADDED_SUBBUF_SIZE:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_PADDED_SUBBUF_SIZE:
 	{
 		unsigned long size;
 
@@ -231,9 +231,9 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
 		size = PAGE_ALIGN(size);
 		return put_ulong(size, arg);
 	}
-	case RING_BUFFER_GET_MAX_SUBBUF_SIZE:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_MAX_SUBBUF_SIZE:
 		return put_ulong(chan->backend.subbuf_size, arg);
-	case RING_BUFFER_GET_MMAP_LEN:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_MMAP_LEN:
 	{
 		unsigned long mmap_buf_len;
 
@@ -246,7 +246,7 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
 			return -EFBIG;
 		return put_ulong(mmap_buf_len, arg);
 	}
-	case RING_BUFFER_GET_MMAP_READ_OFFSET:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_MMAP_READ_OFFSET:
 	{
 		unsigned long sb_bindex;
 
@@ -257,13 +257,13 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd,
 		return put_ulong(buf->backend.array[sb_bindex]->mmap_offset,
 				 arg);
 	}
-	case RING_BUFFER_FLUSH:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH:
 		lib_ring_buffer_switch_remote(buf);
 		return 0;
-	case RING_BUFFER_FLUSH_EMPTY:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH_EMPTY:
 		lib_ring_buffer_switch_remote_empty(buf);
 		return 0;
-	case RING_BUFFER_CLEAR:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_CLEAR:
 		lib_ring_buffer_clear(buf);
 		return 0;
 	default:
@@ -281,51 +281,51 @@ EXPORT_SYMBOL_GPL(lib_ring_buffer_ioctl);
  *
  *	This ioctl implements commands necessary for producer/consumer
  *	and flight recorder reader interaction :
- *	RING_BUFFER_GET_NEXT_SUBBUF
+ *	LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF
  *		Get the next sub-buffer that can be read. It never blocks.
- *	RING_BUFFER_PUT_NEXT_SUBBUF
+ *	LTTNG_KERNEL_ABI_RING_BUFFER_PUT_NEXT_SUBBUF
  *		Release the currently read sub-buffer.
- *	RING_BUFFER_GET_SUBBUF_SIZE
+ *	LTTNG_KERNEL_ABI_RING_BUFFER_GET_SUBBUF_SIZE
  *		returns the size of the current sub-buffer.
- *	RING_BUFFER_GET_MAX_SUBBUF_SIZE
+ *	LTTNG_KERNEL_ABI_RING_BUFFER_GET_MAX_SUBBUF_SIZE
  *		returns the maximum size for sub-buffers.
- *	RING_BUFFER_GET_NUM_SUBBUF
+ *	LTTNG_KERNEL_ABI_RING_BUFFER_GET_NUM_SUBBUF
  *		returns the number of reader-visible sub-buffers in the per cpu
  *              channel (for mmap).
- *      RING_BUFFER_GET_MMAP_READ_OFFSET
+ *      LTTNG_KERNEL_ABI_RING_BUFFER_GET_MMAP_READ_OFFSET
  *              returns the offset of the subbuffer belonging to the reader.
  *              Should only be used for mmap clients.
  */
 static
 long vfs_lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
 
 	return lib_ring_buffer_ioctl(filp, cmd, arg, buf);
 }
 
 #ifdef CONFIG_COMPAT
 long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
-		unsigned long arg, struct lib_ring_buffer *buf)
+		unsigned long arg, struct lttng_kernel_ring_buffer *buf)
 {
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 
 	if (lib_ring_buffer_channel_is_disabled(chan))
 		return -EIO;
 
 	switch (cmd) {
-	case RING_BUFFER_COMPAT_SNAPSHOT:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_SNAPSHOT:
 		return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
 						&buf->prod_snapshot);
-	case RING_BUFFER_COMPAT_SNAPSHOT_SAMPLE_POSITIONS:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_SNAPSHOT_SAMPLE_POSITIONS:
 		return lib_ring_buffer_snapshot_sample_positions(buf,
 				&buf->cons_snapshot, &buf->prod_snapshot);
-	case RING_BUFFER_COMPAT_SNAPSHOT_GET_CONSUMED:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_SNAPSHOT_GET_CONSUMED:
 		return compat_put_ulong(buf->cons_snapshot, arg);
-	case RING_BUFFER_COMPAT_SNAPSHOT_GET_PRODUCED:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_SNAPSHOT_GET_PRODUCED:
 		return compat_put_ulong(buf->prod_snapshot, arg);
-	case RING_BUFFER_COMPAT_GET_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_SUBBUF:
 	{
 		__u32 uconsume;
 		unsigned long consume;
@@ -344,11 +344,11 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		}
 		return ret;
 	}
-	case RING_BUFFER_COMPAT_PUT_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_PUT_SUBBUF:
 		lib_ring_buffer_put_subbuf(buf);
 		return 0;
 
-	case RING_BUFFER_COMPAT_GET_NEXT_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_NEXT_SUBBUF:
 	{
 		long ret;
 
@@ -359,10 +359,10 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		}
 		return ret;
 	}
-	case RING_BUFFER_COMPAT_PUT_NEXT_SUBBUF:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_PUT_NEXT_SUBBUF:
 		lib_ring_buffer_put_next_subbuf(buf);
 		return 0;
-	case RING_BUFFER_COMPAT_GET_SUBBUF_SIZE:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_SUBBUF_SIZE:
 	{
 		unsigned long data_size;
 
@@ -371,7 +371,7 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 			return -EFBIG;
 		return compat_put_ulong(data_size, arg);
 	}
-	case RING_BUFFER_COMPAT_GET_PADDED_SUBBUF_SIZE:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_PADDED_SUBBUF_SIZE:
 	{
 		unsigned long size;
 
@@ -381,11 +381,11 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 			return -EFBIG;
 		return compat_put_ulong(size, arg);
 	}
-	case RING_BUFFER_COMPAT_GET_MAX_SUBBUF_SIZE:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_MAX_SUBBUF_SIZE:
 		if (chan->backend.subbuf_size > UINT_MAX)
 			return -EFBIG;
 		return compat_put_ulong(chan->backend.subbuf_size, arg);
-	case RING_BUFFER_COMPAT_GET_MMAP_LEN:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_MMAP_LEN:
 	{
 		unsigned long mmap_buf_len;
 
@@ -398,7 +398,7 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 			return -EFBIG;
 		return compat_put_ulong(mmap_buf_len, arg);
 	}
-	case RING_BUFFER_COMPAT_GET_MMAP_READ_OFFSET:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_GET_MMAP_READ_OFFSET:
 	{
 		unsigned long sb_bindex, read_offset;
 
@@ -411,13 +411,13 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 			return -EINVAL;
 		return compat_put_ulong(read_offset, arg);
 	}
-	case RING_BUFFER_COMPAT_FLUSH:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_FLUSH:
 		lib_ring_buffer_switch_remote(buf);
 		return 0;
-	case RING_BUFFER_COMPAT_FLUSH_EMPTY:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_FLUSH_EMPTY:
 		lib_ring_buffer_switch_remote_empty(buf);
 		return 0;
-	case RING_BUFFER_COMPAT_CLEAR:
+	case LTTNG_KERNEL_ABI_RING_BUFFER_COMPAT_CLEAR:
 		lib_ring_buffer_clear(buf);
 		return 0;
 	default:
@@ -430,7 +430,7 @@ static
 long vfs_lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 				  unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
 
 	return lib_ring_buffer_compat_ioctl(filp, cmd, arg, buf);
 }