X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-abi.c;h=cc45389403df8301fe72cd142d22615e315bacc3;hb=05355f0bf8b4292ab7b8dc93571a568833b0a3c2;hp=a78f2e332f34ef0434225380fbc77eed595cb881;hpb=f7d06400be7d046205c20277a03f3f31bf5b1703;p=lttng-modules.git

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index a78f2e33..cc453894 100644
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -999,8 +999,8 @@ ssize_t lttng_event_notifier_group_notif_read(struct file *filp, char __user *us
 		size_t count, loff_t *ppos)
 {
 	struct lttng_event_notifier_group *event_notifier_group = filp->private_data;
-	struct channel *chan = event_notifier_group->chan;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
+	struct lttng_kernel_ring_buffer_channel *chan = event_notifier_group->chan;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
 	ssize_t read_count = 0, len;
 	size_t read_offset;
 
@@ -1105,9 +1105,9 @@ unsigned int lttng_event_notifier_group_notif_poll(struct file *filp,
 {
 	unsigned int mask = 0;
 	struct lttng_event_notifier_group *event_notifier_group = filp->private_data;
-	struct channel *chan = event_notifier_group->chan;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer_channel *chan = event_notifier_group->chan;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	int finalized, disabled;
 	unsigned long consumed, offset;
 	size_t subbuffer_header_size = config->cb.subbuffer_header_size();
@@ -1179,7 +1179,7 @@ retry:
 static int lttng_event_notifier_group_notif_open(struct inode *inode, struct file *file)
 {
 	struct lttng_event_notifier_group *event_notifier_group = inode->i_private;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
 
 	file->private_data = event_notifier_group;
 	return lib_ring_buffer_open(inode, file, buf);
@@ -1195,7 +1195,7 @@ static int lttng_event_notifier_group_notif_open(struct inode *inode, struct fil
 static int lttng_event_notifier_group_notif_release(struct inode *inode, struct file *file)
 {
 	struct lttng_event_notifier_group *event_notifier_group = file->private_data;
-	struct lib_ring_buffer *buf = event_notifier_group->buf;
+	struct lttng_kernel_ring_buffer *buf = event_notifier_group->buf;
 	int ret;
 
 	ret = lib_ring_buffer_release(inode, file, buf);
@@ -1225,7 +1225,7 @@ unsigned int lttng_metadata_ring_buffer_poll(struct file *filp,
 		poll_table *wait)
 {
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 	int finalized;
 	unsigned int mask = 0;
 
@@ -1301,7 +1301,7 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 {
 	int ret;
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 	unsigned int rb_cmd;
 	bool coherent;
 
@@ -1314,8 +1314,8 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, NULL);
 		if (ret > 0) {
@@ -1336,8 +1336,8 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		/*
 		 * Before doing the actual ring buffer flush, write up to one
@@ -1363,8 +1363,8 @@ long lttng_metadata_ring_buffer_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, &coherent);
 		if (ret > 0) {
@@ -1410,7 +1410,7 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 {
 	int ret;
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 	unsigned int rb_cmd;
 	bool coherent;
 
@@ -1423,8 +1423,8 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, NULL);
 		if (ret > 0) {
@@ -1445,8 +1445,8 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_FLUSH:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		/*
 		 * Before doing the actual ring buffer flush, write up to one
@@ -1472,8 +1472,8 @@ long lttng_metadata_ring_buffer_compat_ioctl(struct file *filp,
 	case LTTNG_KERNEL_ABI_RING_BUFFER_GET_NEXT_SUBBUF_METADATA_CHECK:
 	{
 		struct lttng_metadata_stream *stream = filp->private_data;
-		struct lib_ring_buffer *buf = stream->priv;
-		struct channel *chan = buf->backend.chan;
+		struct lttng_kernel_ring_buffer *buf = stream->priv;
+		struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
 
 		ret = lttng_metadata_output_channel(stream, chan, &coherent);
 		if (ret > 0) {
@@ -1521,7 +1521,7 @@ static
 int lttng_metadata_ring_buffer_open(struct inode *inode, struct file *file)
 {
 	struct lttng_metadata_stream *stream = inode->i_private;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	file->private_data = buf;
 	/*
@@ -1539,7 +1539,7 @@ static
 int lttng_metadata_ring_buffer_release(struct inode *inode, struct file *file)
 {
 	struct lttng_metadata_stream *stream = file->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	mutex_lock(&stream->metadata_cache->lock);
 	list_del(&stream->list);
@@ -1556,7 +1556,7 @@ ssize_t lttng_metadata_ring_buffer_splice_read(struct file *in, loff_t *ppos,
 		unsigned int flags)
 {
 	struct lttng_metadata_stream *stream = in->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	return lib_ring_buffer_splice_read(in, ppos, pipe, len,
 			flags, buf);
@@ -1567,7 +1567,7 @@ int lttng_metadata_ring_buffer_mmap(struct file *filp,
 		struct vm_area_struct *vma)
 {
 	struct lttng_metadata_stream *stream = filp->private_data;
-	struct lib_ring_buffer *buf = stream->priv;
+	struct lttng_kernel_ring_buffer *buf = stream->priv;
 
 	return lib_ring_buffer_mmap(filp, vma, buf);
 }
@@ -1628,7 +1628,7 @@ static
 int lttng_abi_open_stream(struct file *channel_file)
 {
 	struct lttng_kernel_channel_buffer *channel = channel_file->private_data;
-	struct lib_ring_buffer *buf;
+	struct lttng_kernel_ring_buffer *buf;
 	int ret;
 	void *stream_priv;
 
@@ -1655,7 +1655,7 @@ int lttng_abi_open_metadata_stream(struct file *channel_file)
 {
 	struct lttng_kernel_channel_buffer *channel = channel_file->private_data;
 	struct lttng_kernel_session *session = channel->parent.session;
-	struct lib_ring_buffer *buf;
+	struct lttng_kernel_ring_buffer *buf;
 	int ret;
 	struct lttng_metadata_stream *metadata_stream;
 	void *stream_priv;
@@ -1720,8 +1720,8 @@ static
 int lttng_abi_open_event_notifier_group_stream(struct file *notif_file)
 {
 	struct lttng_event_notifier_group *event_notifier_group = notif_file->private_data;
-	struct channel *chan = event_notifier_group->chan;
-	struct lib_ring_buffer *buf;
+	struct lttng_kernel_ring_buffer_channel *chan = event_notifier_group->chan;
+	struct lttng_kernel_ring_buffer *buf;
 	int ret;
 	void *stream_priv;
 
@@ -2741,9 +2741,9 @@ static int put_u32(uint32_t val, unsigned long arg)
 static long lttng_stream_ring_buffer_ioctl(struct file *filp,
 		unsigned int cmd, unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	const struct lttng_kernel_channel_buffer_ops *ops = chan->backend.priv_ops;
 	int ret;
 
@@ -2845,9 +2845,9 @@ error:
 static long lttng_stream_ring_buffer_compat_ioctl(struct file *filp,
 		unsigned int cmd, unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
-	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = &chan->backend.config;
+	struct lttng_kernel_ring_buffer *buf = filp->private_data;
+	struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+	const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config;
 	const struct lttng_kernel_channel_buffer_ops *ops = chan->backend.priv_ops;
 	int ret;