X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=include%2Flttng%2Fringbuffer-config.h;h=421a8637c5ca8fec432f3aa219527cdba12c92b6;hp=87344c94c8285f94b296f318ae58880dedcc7a39;hb=e56bb47c3af00db3bc9e2dea711bef4882e6ef4c;hpb=a9ff648cc4cc06d28b522d705c467d45ab916a9d

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 87344c94..421a8637 100644
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -57,7 +57,8 @@ struct lttng_ust_lib_ring_buffer_client_cb {
 	size_t (*record_header_size) (const struct lttng_ust_lib_ring_buffer_config *config,
 				      struct channel *chan, size_t offset,
 				      size_t *pre_header_padding,
-				      struct lttng_ust_lib_ring_buffer_ctx *ctx);
+				      struct lttng_ust_lib_ring_buffer_ctx *ctx,
+				      void *client_ctx);
 
 	/* Slow path only, at subbuffer switch */
 	size_t (*subbuffer_header_size) (void);
@@ -228,7 +229,7 @@ struct lttng_ust_lib_ring_buffer_config {
  * removed.
  */
 #define LTTNG_UST_RING_BUFFER_CTX_PADDING	\
-		(24 - sizeof(int) - sizeof(void *))
+		(24 - sizeof(int) - sizeof(void *) - sizeof(void *))
 struct lttng_ust_lib_ring_buffer_ctx {
 	/* input received by lib_ring_buffer_reserve(), saved here. */
 	struct channel *chan;		/* channel */
@@ -256,9 +257,22 @@ struct lttng_ust_lib_ring_buffer_ctx {
 					 */
 	uint64_t tsc;			/* time-stamp counter value */
 	unsigned int rflags;		/* reservation flags */
-	unsigned int padding1;		/* padding to realign on pointer */
+	/*
+	 * The field ctx_len is the length of struct
+	 * lttng_ust_lib_ring_buffer_ctx as known by the user of
+	 * lib_ring_buffer_ctx_init.
+	 */
+	unsigned int ctx_len;
 	void *ip;			/* caller ip address */
+	void *priv2;			/* 2nd priv data */
 	char padding2[LTTNG_UST_RING_BUFFER_CTX_PADDING];
+	/*
+	 * This is the end of the initial fields expected by the original ABI
+	 * between probes and UST. Only the fields above can be used if
+	 * ctx_len is 0. Use the value of ctx_len to find out which of the
+	 * following fields may be used.
+	 */
+	struct lttng_ust_lib_ring_buffer_backend_pages *backend_pages;
 };
 
 /**
@@ -274,12 +288,14 @@ static inline lttng_ust_notrace
 void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			      struct channel *chan, void *priv,
 			      size_t data_size, int largest_align,
-			      int cpu, struct lttng_ust_shm_handle *handle);
+			      int cpu, struct lttng_ust_shm_handle *handle,
+			      void *priv2);
 static inline
 void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			      struct channel *chan, void *priv,
 			      size_t data_size, int largest_align,
-			      int cpu, struct lttng_ust_shm_handle *handle)
+			      int cpu, struct lttng_ust_shm_handle *handle,
+			      void *priv2)
 {
 	ctx->chan = chan;
 	ctx->priv = priv;
@@ -288,8 +304,9 @@ void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	ctx->cpu = cpu;
 	ctx->rflags = 0;
 	ctx->handle = handle;
-	ctx->padding1 = 0;
+	ctx->ctx_len = sizeof(struct lttng_ust_lib_ring_buffer_ctx);
 	ctx->ip = 0;
+	ctx->priv2 = priv2;
 	memset(ctx->padding2, 0, LTTNG_UST_RING_BUFFER_CTX_PADDING);
 }