X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Fringbuffer%2Fbackend_internal.h;h=9ab55e75bfcbc934a61b77000dcec1a87e2e2e1c;hb=8a57ec025ffbe56153748fd69b60118862707182;hp=c76b25a85ed2eeffa1f3ccd99dccaa0e2b6bcea8;hpb=585e5dcc4bf017c03b86dc84371f9c6170e12785;p=lttng-modules.git

diff --git a/include/ringbuffer/backend_internal.h b/include/ringbuffer/backend_internal.h
index c76b25a8..9ab55e75 100644
--- a/include/ringbuffer/backend_internal.h
+++ b/include/ringbuffer/backend_internal.h
@@ -192,12 +192,12 @@ int subbuffer_id_check_index(const struct lib_ring_buffer_config *config,
 
 static inline
 void lib_ring_buffer_backend_get_pages(const struct lib_ring_buffer_config *config,
-			struct lib_ring_buffer_ctx *ctx,
+			struct lttng_kernel_ring_buffer_ctx *ctx,
 			struct lib_ring_buffer_backend_pages **backend_pages)
 {
-	struct lib_ring_buffer_backend *bufb = &ctx->buf->backend;
-	struct channel_backend *chanb = &ctx->chan->backend;
-	size_t sbidx, offset = ctx->buf_offset;
+	struct lib_ring_buffer_backend *bufb = &ctx->priv.buf->backend;
+	struct channel_backend *chanb = &ctx->priv.chan->backend;
+	size_t sbidx, offset = ctx->priv.buf_offset;
 	unsigned long sb_bindex, id;
 	struct lib_ring_buffer_backend_pages *rpages;
 
@@ -206,7 +206,7 @@ void lib_ring_buffer_backend_get_pages(const struct lib_ring_buffer_config *conf
 	id = bufb->buf_wsb[sbidx].id;
 	sb_bindex = subbuffer_id_get_index(config, id);
 	rpages = bufb->array[sb_bindex];
-	CHAN_WARN_ON(ctx->chan,
+	CHAN_WARN_ON(ctx->priv.chan,
 		     config->mode == RING_BUFFER_OVERWRITE
 		     && subbuffer_id_is_noref(config, id));
 	*backend_pages = rpages;
@@ -216,9 +216,9 @@ void lib_ring_buffer_backend_get_pages(const struct lib_ring_buffer_config *conf
 static inline
 struct lib_ring_buffer_backend_pages *
 	lib_ring_buffer_get_backend_pages_from_ctx(const struct lib_ring_buffer_config *config,
-		struct lib_ring_buffer_ctx *ctx)
+		struct lttng_kernel_ring_buffer_ctx *ctx)
 {
-	return ctx->backend_pages;
+	return ctx->priv.backend_pages;
 }
 
 /*
@@ -236,14 +236,6 @@ void subbuffer_count_record(const struct lib_ring_buffer_config *config,
 	sb_bindex = subbuffer_id_get_index(config, bufb->buf_wsb[idx].id);
 	v_inc(config, &bufb->array[sb_bindex]->records_commit);
 }
-#else /* LTTNG_RING_BUFFER_COUNT_EVENTS */
-static inline
-void subbuffer_count_record(const struct lib_ring_buffer_config *config,
-			    struct lib_ring_buffer_backend *bufb,
-			    unsigned long idx)
-{
-}
-#endif /* #else LTTNG_RING_BUFFER_COUNT_EVENTS */
 
 /*
  * Reader has exclusive subbuffer access for record consumption. No need to
@@ -262,6 +254,19 @@ void subbuffer_consume_record(const struct lib_ring_buffer_config *config,
 	_v_dec(config, &bufb->array[sb_bindex]->records_unread);
 	v_inc(config, &bufb->records_read);
 }
+#else /* LTTNG_RING_BUFFER_COUNT_EVENTS */
+static inline
+void subbuffer_count_record(const struct lib_ring_buffer_config *config,
+			    struct lib_ring_buffer_backend *bufb,
+			    unsigned long idx)
+{
+}
+static inline
+void subbuffer_consume_record(const struct lib_ring_buffer_config *config,
+			      struct lib_ring_buffer_backend *bufb)
+{
+}
+#endif /* #else LTTNG_RING_BUFFER_COUNT_EVENTS */
 
 static inline
 unsigned long subbuffer_get_records_count(