Rename struct channel to struct lttng_kernel_ring_buffer_channel

[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 e8f94e24df9407c6bfffcd0de85a63aec05e8843..70eb555e282b837ed79487092fce1cc21df81b1c 100644 (file)
--- a/src/lttng-ring-buffer-client.h
+++ b/src/lttng-ring-buffer-client.h
@@ -69,7 +69,7 @@ struct lttng_client_ctx {
        size_t event_context_len;
 };
 
-static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan)
+static inline notrace u64 lib_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return trace_clock_read64();
 }
@@ -136,7 +136,7 @@ void ctx_record(struct lttng_kernel_ring_buffer_ctx *bufctx,
  */
 static __inline__
 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 lttng_kernel_ring_buffer_ctx *ctx,
                                 struct lttng_client_ctx *client_ctx)
@@ -318,14 +318,14 @@ void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
 
 static const struct lib_ring_buffer_config client_config;
 
-static u64 client_ring_buffer_clock_read(struct channel *chan)
+static u64 client_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return lib_ring_buffer_clock_read(chan);
 }
 
 static
 size_t client_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 lttng_kernel_ring_buffer_ctx *ctx,
                                 void *client_ctx)
@@ -349,7 +349,7 @@ static size_t client_packet_header_size(void)
 static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
                                unsigned int subbuf_idx)
 {
-       struct channel *chan = buf->backend.chan;
+       struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
        struct packet_header *header =
                (struct packet_header *)
                        lib_ring_buffer_offset_address(&buf->backend,
@@ -379,7 +379,7 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
 static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
                              unsigned int subbuf_idx, unsigned long data_size)
 {
-       struct channel *chan = buf->backend.chan;
+       struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
        struct packet_header *header =
                (struct packet_header *)
                        lib_ring_buffer_offset_address(&buf->backend,
@@ -468,7 +468,7 @@ static int client_stream_id(const struct lib_ring_buffer_config *config,
                        struct lib_ring_buffer *buf,
                        uint64_t *stream_id)
 {
-       struct channel *chan = buf->backend.chan;
+       struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
        struct lttng_kernel_channel_buffer *lttng_chan = channel_get_private(chan);
 
        *stream_id = lttng_chan->priv->id;
@@ -532,20 +532,20 @@ void release_priv_ops(void *priv_ops)
 }
 
 static
-void lttng_channel_destroy(struct channel *chan)
+void lttng_channel_destroy(struct lttng_kernel_ring_buffer_channel *chan)
 {
        channel_destroy(chan);
 }
 
 static
-struct channel *_channel_create(const char *name,
+struct lttng_kernel_ring_buffer_channel *_channel_create(const char *name,
                                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_kernel_channel_buffer *lttng_chan = priv;
-       struct channel *chan;
+       struct lttng_kernel_ring_buffer_channel *chan;
 
        chan = channel_create(&client_config, name, lttng_chan, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
@@ -570,7 +570,7 @@ error:
 }
 
 static
-struct lib_ring_buffer *lttng_buffer_read_open(struct channel *chan)
+struct lib_ring_buffer *lttng_buffer_read_open(struct lttng_kernel_ring_buffer_channel *chan)
 {
        struct lib_ring_buffer *buf;
        int cpu;
@@ -584,7 +584,7 @@ struct lib_ring_buffer *lttng_buffer_read_open(struct channel *chan)
 }
 
 static
-int lttng_buffer_has_read_closed_stream(struct channel *chan)
+int lttng_buffer_has_read_closed_stream(struct lttng_kernel_ring_buffer_channel *chan)
 {
        struct lib_ring_buffer *buf;
        int cpu;
@@ -698,7 +698,7 @@ void lttng_channel_buffer_lost_event_too_big(struct lttng_kernel_channel_buffer
 }
 
 static
-wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct channel *chan, int cpu)
+wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct lttng_kernel_ring_buffer_channel *chan, int cpu)
 {
        struct lib_ring_buffer *buf = channel_get_ring_buffer(&client_config,
                                        chan, cpu);
@@ -706,19 +706,19 @@ wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct channel *chan, int cpu
 }
 
 static
-wait_queue_head_t *lttng_get_hp_wait_queue(struct channel *chan)
+wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return &chan->hp_wait;
 }
 
 static
-int lttng_is_finalized(struct channel *chan)
+int lttng_is_finalized(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return lib_ring_buffer_channel_is_finalized(chan);
 }
 
 static
-int lttng_is_disabled(struct channel *chan)
+int lttng_is_disabled(struct lttng_kernel_ring_buffer_channel *chan)
 {
        return lib_ring_buffer_channel_is_disabled(chan);
 }