X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flttng-ring-buffer-metadata-client.h;h=f697cafd107d0ca11064bfda9f43f7800540a52f;hb=17f90b04459c851547b2dc6e90e3bded1b1206d5;hp=12fcd914969d12d781a8396334d2ff6352d499fc;hpb=5a15f70c5211ff4a398171a6971586e2948eb419;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-metadata-client.h b/src/lttng-ring-buffer-metadata-client.h
index 12fcd914..f697cafd 100644
--- a/src/lttng-ring-buffer-metadata-client.h
+++ b/src/lttng-ring-buffer-metadata-client.h
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_mappings() */
 #include <lttng/events.h>
+#include <lttng/events-internal.h>
 #include <lttng/tracer.h>
 
 static struct lttng_transport lttng_relay_transport;
@@ -237,11 +238,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,
@@ -299,15 +301,19 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf)
 }
 
 static
-int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx, uint32_t event_id)
+int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx)
 {
+	struct channel *chan = ctx->client_priv;
 	int ret;
 
+	memset(&ctx->priv, 0, sizeof(ctx->priv));
+	ctx->priv.chan = chan;
+
 	ret = lib_ring_buffer_reserve(&client_config, ctx, NULL);
 	if (ret)
 		return ret;
 	lib_ring_buffer_backend_get_pages(&client_config, ctx,
-			&ctx->backend_pages);
+			&ctx->priv.backend_pages);
 	return 0;
 
 }