Rename struct channel to struct lttng_kernel_ring_buffer_channel

[lttng-modules.git] / include / ringbuffer / config.h

diff --git a/include/ringbuffer/config.h b/include/ringbuffer/config.h
index bc638f941f20365d76fef12b004c0619fe10934a..a6821267caa0dce139327e2df5022415ece3c8db 100644 (file)
--- a/include/ringbuffer/config.h
+++ b/include/ringbuffer/config.h
@@ -17,9 +17,9 @@
 #include <lttng/tracer-core.h>
 
 struct lib_ring_buffer;
-struct channel;
+struct lttng_kernel_ring_buffer_channel;
 struct lib_ring_buffer_config;
-struct lib_ring_buffer_ctx;
+struct lttng_kernel_ring_buffer_ctx;
 struct lttng_kernel_ring_buffer_ctx_private;
 
 /*
@@ -32,11 +32,11 @@ struct lib_ring_buffer_client_cb {
        /* Mandatory callbacks */
 
        /* A static inline version is also required for fast path */
-       u64 (*ring_buffer_clock_read) (struct channel *chan);
+       u64 (*ring_buffer_clock_read) (struct lttng_kernel_ring_buffer_channel *chan);
        size_t (*record_header_size) (const struct lib_ring_buffer_config *config,
-                                     struct channel *chan, size_t offset,
+                                     struct lttng_kernel_ring_buffer_channel *chan, size_t offset,
                                      size_t *pre_header_padding,
-                                     struct lib_ring_buffer_ctx *ctx,
+                                     struct lttng_kernel_ring_buffer_ctx *ctx,
                                      void *client_ctx);
 
        /* Slow path only, at subbuffer switch */
@@ -63,7 +63,7 @@ struct lib_ring_buffer_client_cb {
         * iterator.
         */
        void (*record_get) (const struct lib_ring_buffer_config *config,
-                           struct channel *chan, struct lib_ring_buffer *buf,
+                           struct lttng_kernel_ring_buffer_channel *chan, struct lib_ring_buffer *buf,
                            size_t offset, size_t *header_len,
                            size_t *payload_len, u64 *timestamp);
 };
@@ -169,7 +169,7 @@ struct lib_ring_buffer_config {
 
 struct lttng_kernel_ring_buffer_ctx_private {
        /* input received by lib_ring_buffer_reserve(). */
-       struct channel *chan;                   /* ring buffer channel */
+       struct lttng_kernel_ring_buffer_channel *chan;                  /* ring buffer channel */
 
        /* output from lib_ring_buffer_reserve() */
        int reserve_cpu;                        /* processor id updated by the reserve */
@@ -198,7 +198,7 @@ struct lttng_kernel_ring_buffer_ctx_private {
  * lib_ring_buffer_try_discard_reserve(), lib_ring_buffer_align_ctx() and
  * lib_ring_buffer_write().
  */
-struct lib_ring_buffer_ctx {
+struct lttng_kernel_ring_buffer_ctx {
        /* Private ring buffer context, set by reserve callback. */
        struct lttng_kernel_ring_buffer_ctx_private priv;
 
@@ -210,7 +210,7 @@ struct lib_ring_buffer_ctx {
                                         * alignment of the largest element
                                         * in the payload
                                         */
-       struct lttng_probe_ctx *probe_ctx;      /* Probe context */
+       struct lttng_kernel_probe_ctx *probe_ctx;       /* Probe context */
 };
 
 /**
@@ -221,10 +221,10 @@ struct lib_ring_buffer_ctx {
  * @largest_align: largest alignment within data payload types
  */
 static inline
-void lib_ring_buffer_ctx_init(struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_ctx_init(struct lttng_kernel_ring_buffer_ctx *ctx,
                              void *client_priv,
                              size_t data_size, int largest_align,
-                             struct lttng_probe_ctx *probe_ctx)
+                             struct lttng_kernel_probe_ctx *probe_ctx)
 {
        ctx->client_priv = client_priv;
        ctx->data_size = data_size;
@@ -294,7 +294,7 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
  * @ctx: ring buffer context.
  */
 static inline
-void lib_ring_buffer_align_ctx(struct lib_ring_buffer_ctx *ctx,
+void lib_ring_buffer_align_ctx(struct lttng_kernel_ring_buffer_ctx *ctx,
                           size_t alignment)
 {
        ctx->priv.buf_offset += lib_ring_buffer_align(ctx->priv.buf_offset,