Refactoring: type description structures

[lttng-modules.git] / src / lttng-ring-buffer-client.h

diff --git a/src/lttng-ring-buffer-client.h b/src/lttng-ring-buffer-client.h
index fa0b8d4709d2e4122edd654c77770d4ed3d64bdb..6055d66bc63ee1437b3d3d4fc8a45e520a7e65d0 100644 (file)
--- a/src/lttng-ring-buffer-client.h
+++ b/src/lttng-ring-buffer-client.h
@@ -74,7 +74,7 @@ static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan)
 }
 
 static inline
-size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx,
+size_t ctx_get_aligned_size(size_t offset, struct lttng_kernel_ctx *ctx,
                size_t ctx_len)
 {
        size_t orig_offset = offset;
@@ -87,7 +87,7 @@ size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx,
 }
 
 static inline
-void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
+void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
                struct lttng_channel *chan, struct lib_ring_buffer_ctx *bufctx)
 {
        int i;
@@ -110,7 +110,7 @@ void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len,
 static inline
 void ctx_record(struct lib_ring_buffer_ctx *bufctx,
                struct lttng_channel *chan,
-               struct lttng_ctx *ctx)
+               struct lttng_kernel_ctx *ctx)
 {
        int i;
 
@@ -550,11 +550,12 @@ void lttng_channel_destroy(struct channel *chan)
 
 static
 struct channel *_channel_create(const char *name,
-                               struct lttng_channel *lttng_chan, void *buf_addr,
+                               void *priv, void *buf_addr,
                                size_t subbuf_size, size_t num_subbuf,
                                unsigned int switch_timer_interval,
                                unsigned int read_timer_interval)
 {
+       struct lttng_channel *lttng_chan = priv;
        struct channel *chan;
 
        chan = channel_create(&client_config, name, lttng_chan, buf_addr,