X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=cac61343acc8723f714d0e794bbe6439bcf5716c;hb=b1f720f08ebd9f83045a8ed7689658b8171a8adf;hp=79786af255444f9b1da6d3f8b38e22b023e1a9a1;hpb=cd61d9bfa5fd334b086831dcbdec63da6c0d1a16;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 79786af2..cac61343 100644
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -8,10 +8,12 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <lttng/ust-events.h>
+
+#include <ust-events-internal.h>
 #include "ust-bitfield.h"
 #include "ust-compat.h"
 #include "clock.h"
+#include "context-internal.h"
 #include "lttng-tracer.h"
 #include "../libringbuffer/frontend_types.h"
 
@@ -170,7 +172,7 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
 				 struct lttng_client_ctx *client_ctx)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(chan);
-	struct lttng_event *event = ctx->priv;
+	struct lttng_ust_event_recorder *event_recorder = ctx->priv;
 	struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
 	size_t orig_offset = offset;
 	size_t padding;
@@ -220,7 +222,7 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
 		/* Pre 2.8 probe ABI. */
 		offset += ctx_get_aligned_size(offset, lttng_chan->ctx,
 				client_ctx->packet_context_len);
-		offset += ctx_get_aligned_size(offset, event->ctx,
+		offset += ctx_get_aligned_size(offset, event_recorder->ctx,
 				client_ctx->event_context_len);
 	}
 	*pre_header_padding = padding;
@@ -250,7 +252,7 @@ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con
 			    uint32_t event_id)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
-	struct lttng_event *event = ctx->priv;
+	struct lttng_ust_event_recorder *event_recorder = ctx->priv;
 	struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
 
 	if (caa_unlikely(ctx->rflags))
@@ -293,7 +295,7 @@ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con
 	} else {
 		/* Pre 2.8 probe ABI. */
 		ctx_record(ctx, lttng_chan, lttng_chan->ctx, APP_CTX_DISABLED);
-		ctx_record(ctx, lttng_chan, event->ctx, APP_CTX_DISABLED);
+		ctx_record(ctx, lttng_chan, event_recorder->ctx, APP_CTX_DISABLED);
 	}
 	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
@@ -309,7 +311,7 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
 				 uint32_t event_id)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
-	struct lttng_event *event = ctx->priv;
+	struct lttng_ust_event_recorder *event_recorder = ctx->priv;
 	struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
 
 	switch (lttng_chan->header_type) {
@@ -374,7 +376,7 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
 	} else {
 		/* Pre 2.8 probe ABI. */
 		ctx_record(ctx, lttng_chan, lttng_chan->ctx, APP_CTX_DISABLED);
-		ctx_record(ctx, lttng_chan, event->ctx, APP_CTX_DISABLED);
+		ctx_record(ctx, lttng_chan, event_recorder->ctx, APP_CTX_DISABLED);
 	}
 	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
@@ -659,8 +661,6 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = {
 	.cb_ptr = &client_cb.parent,
 };
 
-const struct lttng_ust_client_lib_ring_buffer_client_cb *LTTNG_CLIENT_CALLBACKS = &client_cb;
-
 static
 struct lttng_channel *_channel_create(const char *name,
 				void *buf_addr,
@@ -706,7 +706,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		      uint32_t event_id)
 {
 	struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
-	struct lttng_event *event = ctx->priv;
+	struct lttng_ust_event_recorder *event_recorder = ctx->priv;
 	struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
 	struct lttng_client_ctx client_ctx;
 	int ret, cpu;
@@ -723,7 +723,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		/* Pre 2.8 probe ABI. */
 		ctx_get_struct_size(lttng_chan->ctx, &client_ctx.packet_context_len,
 				APP_CTX_DISABLED);
-		ctx_get_struct_size(event->ctx, &client_ctx.event_context_len,
+		ctx_get_struct_size(event_recorder->ctx, &client_ctx.event_context_len,
 				APP_CTX_DISABLED);
 	}