X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fbackend.h;h=69c47ab69642d8ea3c8e0ba941423c09f7680b96;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=1bd61109ca0096e2685b864324449b5760dc3128;hpb=a6352fd40a2090fd883a6c369144bf405c9e9ec4;p=lttng-ust.git

diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h
index 1bd61109..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,11 +26,13 @@
 
 /* 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 size_t lib_ring_buffer_read(struct lttng_ust_lib_ring_buffer_backend *bufb,
+				   size_t offset, void *dest, size_t len,
+				   struct lttng_ust_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 int lib_ring_buffer_read_cstr(struct lttng_ust_lib_ring_buffer_backend *bufb,
+				     size_t offset, void *dest, size_t len,
+				     struct lttng_ust_shm_handle *handle);
 
 /*
  * Return the address where a given offset is located.
@@ -39,11 +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,
-			       size_t offset);
+lib_ring_buffer_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb,
+			       size_t offset,
+			       struct lttng_ust_shm_handle *handle);
 extern void *
-lib_ring_buffer_read_offset_address(struct lib_ring_buffer_backend *bufb,
-				    size_t offset);
+lib_ring_buffer_read_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb,
+				    size_t offset,
+				    struct lttng_ust_shm_handle *handle);
 
 /**
  * lib_ring_buffer_write - write data to a buffer backend
@@ -58,22 +62,23 @@ 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 lttng_ust_shm_handle *handle = ctx->handle;
 	size_t sbidx;
 	size_t offset = ctx->buf_offset;
-	struct lib_ring_buffer_backend_pages *rpages;
+	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages;
 	unsigned long sb_bindex, id;
 
 	offset &= chanb->buf_size - 1;
 	sbidx = offset >> chanb->subbuf_size_order;
-	id = shmp(bufb->buf_wsb)[sbidx].id;
+	id = shmp_index(handle, bufb->buf_wsb, sbidx)->id;
 	sb_bindex = subbuffer_id_get_index(config, id);
-	rpages = shmp(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));
@@ -83,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(rpages->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;
 }
@@ -95,25 +100,26 @@ 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)
+				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 *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;
 
-	for (i = 0; i < shmp(bufb->chan)->backend.num_subbuf; i++) {
-		id = shmp(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 = shmp(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 = shmp(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;
 }