X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=c3b77182c2b0223fec775a678d477a66cff60950;hb=49926dbd13cfcb46f6947b7e99bc2999c06dc743;hp=42d68f663f5296d6e089d30cf06f5387a18b3c17;hpb=ae4b659d95f8dab9f2aa4b890d6937d7d5375f07;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 42d68f66..c3b77182 100644
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -8,9 +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"
 
@@ -169,8 +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_stack_ctx *lttng_ctx = ctx->priv2;
+	struct lttng_stack_ctx *lttng_ctx = ctx->priv;
 	size_t orig_offset = offset;
 	size_t padding;
 
@@ -209,19 +211,10 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
 		padding = 0;
 		WARN_ON_ONCE(1);
 	}
-	if (lttng_ctx) {
-		/* 2.8+ probe ABI. */
-		offset += ctx_get_aligned_size(offset, lttng_ctx->chan_ctx,
-				client_ctx->packet_context_len);
-		offset += ctx_get_aligned_size(offset, lttng_ctx->event_ctx,
-				client_ctx->event_context_len);
-	} else {
-		/* 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,
-				client_ctx->event_context_len);
-	}
+	offset += ctx_get_aligned_size(offset, lttng_ctx->chan_ctx,
+			client_ctx->packet_context_len);
+	offset += ctx_get_aligned_size(offset, lttng_ctx->event_ctx,
+			client_ctx->event_context_len);
 	*pre_header_padding = padding;
 	return offset - orig_offset;
 }
@@ -249,8 +242,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_stack_ctx *lttng_ctx = ctx->priv2;
+	struct lttng_stack_ctx *lttng_ctx = ctx->priv;
 
 	if (caa_unlikely(ctx->rflags))
 		goto slow_path;
@@ -285,15 +277,8 @@ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con
 		WARN_ON_ONCE(1);
 	}
 
-	if (lttng_ctx) {
-		/* 2.8+ probe ABI. */
-		ctx_record(ctx, lttng_chan, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
-		ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
-	} 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, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
+	ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
 	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
 	return;
@@ -308,8 +293,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_stack_ctx *lttng_ctx = ctx->priv2;
+	struct lttng_stack_ctx *lttng_ctx = ctx->priv;
 
 	switch (lttng_chan->header_type) {
 	case 1:	/* compact */
@@ -366,15 +350,8 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
 	default:
 		WARN_ON_ONCE(1);
 	}
-	if (lttng_ctx) {
-		/* 2.8+ probe ABI. */
-		ctx_record(ctx, lttng_chan, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
-		ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
-	} 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, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
+	ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
 	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
 
@@ -658,8 +635,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,
@@ -705,26 +680,15 @@ 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_stack_ctx *lttng_ctx = ctx->priv2;
+	struct lttng_stack_ctx *lttng_ctx = ctx->priv;
 	struct lttng_client_ctx client_ctx;
 	int ret, cpu;
 
 	/* Compute internal size of context structures. */
-
-	if (lttng_ctx) {
-		/* 2.8+ probe ABI. */
-		ctx_get_struct_size(lttng_ctx->chan_ctx, &client_ctx.packet_context_len,
-				APP_CTX_ENABLED);
-		ctx_get_struct_size(lttng_ctx->event_ctx, &client_ctx.event_context_len,
-				APP_CTX_ENABLED);
-	} else {
-		/* 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,
-				APP_CTX_DISABLED);
-	}
+	ctx_get_struct_size(lttng_ctx->chan_ctx, &client_ctx.packet_context_len,
+			APP_CTX_ENABLED);
+	ctx_get_struct_size(lttng_ctx->event_ctx, &client_ctx.event_context_len,
+			APP_CTX_ENABLED);
 
 	cpu = lib_ring_buffer_get_cpu(&client_config);
 	if (cpu < 0)
@@ -747,13 +711,10 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	ret = lib_ring_buffer_reserve(&client_config, ctx, &client_ctx);
 	if (caa_unlikely(ret))
 		goto put;
-	if (caa_likely(ctx->ctx_len
-			>= sizeof(struct lttng_ust_lib_ring_buffer_ctx))) {
-		if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
-				&ctx->backend_pages)) {
-			ret = -EPERM;
-			goto put;
-		}
+	if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
+			&ctx->backend_pages)) {
+		ret = -EPERM;
+		goto put;
 	}
 	lttng_write_event_header(&client_config, ctx, event_id);
 	return 0;
@@ -831,6 +792,7 @@ int lttng_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle
 static struct lttng_transport lttng_relay_transport = {
 	.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
 	.ops = {
+		.struct_size = sizeof(struct lttng_ust_channel_ops),
 		.channel_create = _channel_create,
 		.channel_destroy = lttng_channel_destroy,
 		.event_reserve = lttng_event_reserve,