X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fbackend.h;h=69c47ab69642d8ea3c8e0ba941423c09f7680b96;hb=2b2d6ff75efc17aa74ea9b0a7f8c756d812804bb;hp=d93f6d1fd09ef2da267ce0b0a7307202a3f9427c;hpb=4746ae29409b78e96543a3b207c91a3c510c6476;p=lttng-ust.git

diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h
index d93f6d1f..69c47ab6 100644
--- a/libringbuffer/backend.h
+++ b/libringbuffer/backend.h
@@ -16,7 +16,7 @@
 
 #include <unistd.h>
 
-#include "ust/core.h"
+#include "lttng/core.h"
 
 /* Internal helpers */
 #include "backend_internal.h"
@@ -26,13 +26,13 @@
 
 /* Ring buffer backend access (read/write) */
 
-extern size_t lib_ring_buffer_read(struct lib_ring_buffer_backend *bufb,
+extern size_t lib_ring_buffer_read(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   size_t offset, void *dest, size_t len,
-				   struct shm_handle *handle);
+				   struct lttng_ust_shm_handle *handle);
 
-extern int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb,
+extern int lib_ring_buffer_read_cstr(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				     size_t offset, void *dest, size_t len,
-				     struct shm_handle *handle);
+				     struct lttng_ust_shm_handle *handle);
 
 /*
  * Return the address where a given offset is located.
@@ -41,13 +41,13 @@ extern int lib_ring_buffer_read_cstr(struct lib_ring_buffer_backend *bufb,
  * as long as the write is never bigger than a page size.
  */
 extern void *
-lib_ring_buffer_offset_address(struct lib_ring_buffer_backend *bufb,
+lib_ring_buffer_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb,
 			       size_t offset,
-			       struct shm_handle *handle);
+			       struct lttng_ust_shm_handle *handle);
 extern void *
-lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb,
+lib_ring_buffer_read_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				    size_t offset,
-				    struct shm_handle *handle);
+				    struct lttng_ust_shm_handle *handle);
 
 /**
  * lib_ring_buffer_write - write data to a buffer backend
@@ -62,16 +62,16 @@ lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb,
  * if copy is crossing a page boundary.
  */
 static inline
-void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
-			   struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_write(const struct lttng_ust_lib_ring_buffer_config *config,
+			   struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			   const void *src, size_t len)
 {
-	struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
+	struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx->buf->backend;
 	struct channel_backend *chanb = &ctx->chan->backend;
-	struct shm_handle *handle = ctx->handle;
+	struct lttng_ust_shm_handle *handle = ctx->handle;
 	size_t sbidx;
 	size_t offset = ctx->buf_offset;
-	struct lib_ring_buffer_backend_pages_shmp *rpages;
+	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages;
 	unsigned long sb_bindex, id;
 
 	offset &= chanb->buf_size - 1;
@@ -88,7 +88,7 @@ void lib_ring_buffer_write(const struct lib_ring_buffer_config *config,
 	 */
 	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)),
+				shmp_index(handle, shmp(handle, rpages->shmp)->p, offset & (chanb->subbuf_size - 1)),
 				src, len);
 	ctx->buf_offset += len;
 }
@@ -100,12 +100,12 @@ 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 shm_handle *handle)
+				const struct lttng_ust_lib_ring_buffer_config *config,
+				struct lttng_ust_lib_ring_buffer *buf,
+				struct lttng_ust_shm_handle *handle)
 {
-	struct lib_ring_buffer_backend *bufb = &buf->backend;
-	struct lib_ring_buffer_backend_pages_shmp *pages;
+	struct lttng_ust_lib_ring_buffer_backend *bufb = &buf->backend;
+	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *pages;
 	unsigned long records_unread = 0, sb_bindex, id;
 	unsigned int i;