X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fbackend.h;h=83e07e426b3de3458a995bcfa953e0e33ee9d1fb;hb=381c0f1ef474e0ae8a96b3753470ca4bda45c764;hp=b50bae1a1f0ca4323fe30a9f73a9204317199589;hpb=4931a13e87ddbbabe4911e622e78c85b2197ecbf;p=lttng-ust.git

diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h
index b50bae1a..83e07e42 100644
--- a/libringbuffer/backend.h
+++ b/libringbuffer/backend.h
@@ -14,6 +14,10 @@
  * the reader in flight recorder mode.
  */
 
+#include <unistd.h>
+
+#include "ust/core.h"
+
 /* Internal helpers */
 #include "backend_internal.h"
 #include "frontend_internal.h"
@@ -23,18 +27,12 @@
 /* Ring buffer backend access (read/write) */
 
 extern size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb,
-				   size_t offset, void *dest, size_t len);
-
-extern int __lib_ring_buffer_copy_to_user(struct lib_ring_buffer_backend *bufb,
-					  size_t offset, void __user *dest,
-					  size_t len);
+				   size_t offset, void *dest, size_t len,
+				   struct shm_handle *handle);
 
 extern int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb,
-				     size_t offset, void *dest, size_t len);
-
-extern struct page **
-lib_ring_buffer_read_get_page(struct lib_ring_buffer_backend *bufb, size_t offset,
-			      void ***virt);
+				     size_t offset, void *dest, size_t len,
+				     struct shm_handle *handle);
 
 /*
  * Return the address where a given offset is located.
@@ -44,10 +42,12 @@ lib_ring_buffer_read_get_page(struct lib_ring_buffer_backend *bufb, size_t offse
  */
 extern void *
 lib_ring_buffer_offset_address(struct lib_ring_buffer_backend *bufb,
-			       size_t offset);
+			       size_t offset,
+			       struct shm_handle *handle);
 extern void *
 lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb,
-				    size_t offset);
+				    size_t offset,
+				    struct shm_handle *handle);
 
 /**
  * lib_ring_buffer_write - write data to a buffer backend
@@ -68,29 +68,28 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
 {
 	struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
 	struct channel_backend *chanb = &ctx->chan->backend;
-	size_t sbidx, index;
+	struct shm_handle *handle = ctx->handle;
+	size_t sbidx;
 	size_t offset = ctx->buf_offset;
-	ssize_t pagecpy;
-	struct lib_ring_buffer_backend_pages *rpages;
+	struct lib_ring_buffer_backend_pages_shmp *rpages;
 	unsigned long sb_bindex, id;
 
 	offset &= chanb->buf_size - 1;
 	sbidx = offset >> chanb->subbuf_size_order;
-	index = (offset & (chanb->subbuf_size - 1)) >> PAGE_SHIFT;
-	pagecpy = min_t(size_t, len, (-offset) & ~PAGE_MASK);
-	id = bufb->buf_wsb[sbidx].id;
+	id = shmp_index(handle, bufb->buf_wsb, sbidx)->id;
 	sb_bindex = subbuffer_id_get_index(config, id);
-	rpages = bufb->array[sb_bindex];
+	rpages = shmp_index(handle, bufb->array, sb_bindex);
 	CHAN_WARN_ON(ctx->chan,
 		     config->mode == RING_BUFFER_OVERWRITE
 		     && subbuffer_id_is_noref(config, id));
-	if (likely(pagecpy == len))
-		lib_ring_buffer_do_copy(config,
-					rpages->p[index].virt
-					    + (offset & ~PAGE_MASK),
-					src, len);
-	else
-		_lib_ring_buffer_write(bufb, offset, src, len, 0);
+	/*
+	 * Underlying layer should never ask for writes across
+	 * subbuffers.
+	 */
+	CHAN_WARN_ON(chanb, offset >= chanb->buf_size);
+	lib_ring_buffer_do_copy(config,
+				shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)),
+				src, len);
 	ctx->buf_offset += len;
 }
 
@@ -102,31 +101,27 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
 static inline
 unsigned long lib_ring_buffer_get_records_unread(
 				const struct lib_ring_buffer_config *config,
-				struct lib_ring_buffer *buf)
+				struct lib_ring_buffer *buf,
+				struct shm_handle *handle)
 {
 	struct lib_ring_buffer_backend *bufb = &buf->backend;
-	struct lib_ring_buffer_backend_pages *pages;
+	struct lib_ring_buffer_backend_pages_shmp *pages;
 	unsigned long records_unread = 0, sb_bindex, id;
 	unsigned int i;
 
-	for (i = 0; i < bufb->chan->backend.num_subbuf; i++) {
-		id = bufb->buf_wsb[i].id;
+	for (i = 0; i < shmp(handle, bufb->chan)->backend.num_subbuf; i++) {
+		id = shmp_index(handle, bufb->buf_wsb, i)->id;
 		sb_bindex = subbuffer_id_get_index(config, id);
-		pages = bufb->array[sb_bindex];
-		records_unread += v_read(config, &pages->records_unread);
+		pages = shmp_index(handle, bufb->array, sb_bindex);
+		records_unread += v_read(config, &shmp(handle, pages->shmp)->records_unread);
 	}
 	if (config->mode == RING_BUFFER_OVERWRITE) {
 		id = bufb->buf_rsb.id;
 		sb_bindex = subbuffer_id_get_index(config, id);
-		pages = bufb->array[sb_bindex];
-		records_unread += v_read(config, &pages->records_unread);
+		pages = shmp_index(handle, bufb->array, sb_bindex);
+		records_unread += v_read(config, &shmp(handle, pages->shmp)->records_unread);
 	}
 	return records_unread;
 }
 
-ssize_t lib_ring_buffer_file_splice_read(struct file *in, loff_t *ppos,
-					 struct pipe_inode_info *pipe,
-					 size_t len, unsigned int flags);
-loff_t lib_ring_buffer_no_llseek(struct file *file, loff_t offset, int origin);
-
 #endif /* _LINUX_RING_BUFFER_BACKEND_H */