X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flttng-ring-buffer-event-notifier-client.h;h=be083350da8d9a893d48ee5501337f0ca52172bf;hb=4071a6283f2291a5894dc6b46608721fc6a56239;hp=9f4382583be17d95cf162bd99c23230b48bc33bb;hpb=ac847066a7e106d38fd18587044622d050dc86a1;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-event-notifier-client.h b/src/lttng-ring-buffer-event-notifier-client.h
index 9f438258..be083350 100644
--- a/src/lttng-ring-buffer-event-notifier-client.h
+++ b/src/lttng-ring-buffer-event-notifier-client.h
@@ -31,14 +31,14 @@ struct event_notifier_record_header {
 static const struct lib_ring_buffer_config client_config;
 
 static inline
-u64 lib_ring_buffer_clock_read(struct channel *chan)
+u64 lib_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
 {
 	return 0;
 }
 
 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,
 				 void *client_ctx)
@@ -58,14 +58,14 @@ size_t record_header_size(const struct lib_ring_buffer_config *config,
 
 #include <ringbuffer/api.h>
 
-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 0;
 }
 
 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)
@@ -174,7 +174,7 @@ int client_instance_id(const struct lib_ring_buffer_config *config,
 }
 
 static void client_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)
 {
@@ -217,20 +217,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_event_notifier_group *event_notifier_group = priv;
-	struct channel *chan;
+	struct lttng_kernel_ring_buffer_channel *chan;
 
 	chan = channel_create(&client_config, name,
 			      event_notifier_group, buf_addr,
@@ -256,7 +256,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;
 
@@ -267,7 +267,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;
@@ -304,7 +304,7 @@ void lttng_write_event_notifier_header(const struct lib_ring_buffer_config *conf
 static
 int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx)
 {
-	struct channel *chan = ctx->client_priv;
+	struct lttng_kernel_ring_buffer_channel *chan = ctx->client_priv;
 	int ret;
 
 	memset(&ctx->priv, 0, sizeof(ctx->priv));
@@ -355,7 +355,7 @@ void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *sr
 }
 
 static
-size_t lttng_packet_avail_size(struct channel *chan)
+size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
 {
 	unsigned long o_begin;
 	struct lib_ring_buffer *buf;
@@ -371,7 +371,7 @@ size_t lttng_packet_avail_size(struct channel *chan)
 }
 
 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);
@@ -379,19 +379,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);
 }