X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fringbuffer-config.h;h=421a8637c5ca8fec432f3aa219527cdba12c92b6;hb=730be651d21f3950980fd61e1c65953017c6322e;hp=42889ccd0e4b5e8a197589c3294afbadafc79211;hpb=46d522007b647e0b64d18d0ed518205c2bbad424;p=lttng-ust.git

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 42889ccd..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);
@@ -92,6 +93,13 @@ struct lttng_ust_lib_ring_buffer_client_cb {
 			    size_t offset, size_t *header_len,
 			    size_t *payload_len, uint64_t *timestamp,
 			    struct lttng_ust_shm_handle *handle);
+	/*
+	 * Offset and size of content size field in client.
+	 */
+	void (*content_size_field) (const struct lttng_ust_lib_ring_buffer_config *config,
+				size_t *offset, size_t *length);
+	void (*packet_size_field) (const struct lttng_ust_lib_ring_buffer_config *config,
+				size_t *offset, size_t *length);
 };
 
 /*
@@ -133,7 +141,7 @@ struct lttng_ust_lib_ring_buffer_client_cb {
  * RING_BUFFER_WAKEUP_NONE does not perform any wakeup whatsoever. The client
  * has the responsibility to perform wakeups.
  */
-#define LTTNG_UST_RING_BUFFER_CONFIG_PADDING	32
+#define LTTNG_UST_RING_BUFFER_CONFIG_PADDING	20
 
 enum lttng_ust_lib_ring_buffer_alloc_types {
 	RING_BUFFER_ALLOC_PER_CPU,
@@ -146,8 +154,8 @@ enum lttng_ust_lib_ring_buffer_sync_types {
 };
 
 enum lttng_ust_lib_ring_buffer_mode_types {
-	RING_BUFFER_OVERWRITE,		/* Overwrite when buffer full */
-	RING_BUFFER_DISCARD,		/* Discard when buffer full */
+	RING_BUFFER_OVERWRITE = 0,	/* Overwrite when buffer full */
+	RING_BUFFER_DISCARD = 1,	/* Discard when buffer full */
 };
 
 enum lttng_ust_lib_ring_buffer_output_types {
@@ -204,6 +212,8 @@ struct lttng_ust_lib_ring_buffer_config {
 	 * callbacks and update the cb pointers.
 	 */
 	int client_type;
+	int _unused1;
+	const struct lttng_ust_lib_ring_buffer_client_cb *cb_ptr;
 	char padding[LTTNG_UST_RING_BUFFER_CONFIG_PADDING];
 };
 
@@ -218,7 +228,8 @@ struct lttng_ust_lib_ring_buffer_config {
  * UST. Fields need to be only added at the end, never reordered, never
  * removed.
  */
-#define LTTNG_UST_RING_BUFFER_CTX_PADDING	24
+#define LTTNG_UST_RING_BUFFER_CTX_PADDING	\
+		(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 */
@@ -246,7 +257,22 @@ struct lttng_ust_lib_ring_buffer_ctx {
 					 */
 	uint64_t tsc;			/* time-stamp counter value */
 	unsigned int rflags;		/* reservation flags */
-	char padding[LTTNG_UST_RING_BUFFER_CTX_PADDING];
+	/*
+	 * 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;
 };
 
 /**
@@ -262,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;
@@ -276,7 +304,10 @@ void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	ctx->cpu = cpu;
 	ctx->rflags = 0;
 	ctx->handle = handle;
-	memset(ctx->padding, 0, LTTNG_UST_RING_BUFFER_CTX_PADDING);
+	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);
 }
 
 /*