X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fringbuffer-config.h;h=c95d35cb348d820e69adba599ad3f90b9583b130;hb=82cd0cfd74e2e7fe71d9ff68a9e521d989f72d99;hp=ca52fc71fb02e90776e9d6157c9e100b5682f3fa;hpb=d2428e875af8666473fb689429eaf1022862510d;p=lttng-ust.git

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index ca52fc71..c95d35cb 100644
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -92,6 +92,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,48 +140,65 @@ 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,
+	RING_BUFFER_ALLOC_GLOBAL,
+};
+
+enum lttng_ust_lib_ring_buffer_sync_types {
+	RING_BUFFER_SYNC_PER_CPU,	/* Wait-free */
+	RING_BUFFER_SYNC_GLOBAL,	/* Lock-free */
+};
+
+enum lttng_ust_lib_ring_buffer_mode_types {
+	RING_BUFFER_OVERWRITE = 0,	/* Overwrite when buffer full */
+	RING_BUFFER_DISCARD = 1,	/* Discard when buffer full */
+};
+
+enum lttng_ust_lib_ring_buffer_output_types {
+	RING_BUFFER_SPLICE,
+	RING_BUFFER_MMAP,
+	RING_BUFFER_READ,		/* TODO */
+	RING_BUFFER_ITERATOR,
+	RING_BUFFER_NONE,
+};
+
+enum lttng_ust_lib_ring_buffer_backend_types {
+	RING_BUFFER_PAGE,
+	RING_BUFFER_VMAP,		/* TODO */
+	RING_BUFFER_STATIC,		/* TODO */
+};
+
+enum lttng_ust_lib_ring_buffer_oops_types {
+	RING_BUFFER_NO_OOPS_CONSISTENCY,
+	RING_BUFFER_OOPS_CONSISTENCY,
+};
+
+enum lttng_ust_lib_ring_buffer_ipi_types {
+	RING_BUFFER_IPI_BARRIER,
+	RING_BUFFER_NO_IPI_BARRIER,
+};
+
+enum lttng_ust_lib_ring_buffer_wakeup_types {
+	RING_BUFFER_WAKEUP_BY_TIMER,	/* wake up performed by timer */
+	RING_BUFFER_WAKEUP_BY_WRITER,	/*
+					 * writer wakes up reader,
+					 * not lock-free
+					 * (takes spinlock).
+					 */
+};
+
 struct lttng_ust_lib_ring_buffer_config {
-	enum {
-		RING_BUFFER_ALLOC_PER_CPU,
-		RING_BUFFER_ALLOC_GLOBAL,
-	} alloc;
-	enum {
-		RING_BUFFER_SYNC_PER_CPU,	/* Wait-free */
-		RING_BUFFER_SYNC_GLOBAL,	/* Lock-free */
-	} sync;
-	enum {
-		RING_BUFFER_OVERWRITE,		/* Overwrite when buffer full */
-		RING_BUFFER_DISCARD,		/* Discard when buffer full */
-	} mode;
-	enum {
-		RING_BUFFER_SPLICE,
-		RING_BUFFER_MMAP,
-		RING_BUFFER_READ,		/* TODO */
-		RING_BUFFER_ITERATOR,
-		RING_BUFFER_NONE,
-	} output;
-	enum {
-		RING_BUFFER_PAGE,
-		RING_BUFFER_VMAP,		/* TODO */
-		RING_BUFFER_STATIC,		/* TODO */
-	} backend;
-	enum {
-		RING_BUFFER_NO_OOPS_CONSISTENCY,
-		RING_BUFFER_OOPS_CONSISTENCY,
-	} oops;
-	enum {
-		RING_BUFFER_IPI_BARRIER,
-		RING_BUFFER_NO_IPI_BARRIER,
-	} ipi;
-	enum {
-		RING_BUFFER_WAKEUP_BY_TIMER,	/* wake up performed by timer */
-		RING_BUFFER_WAKEUP_BY_WRITER,	/*
-						 * writer wakes up reader,
-						 * not lock-free
-						 * (takes spinlock).
-						 */
-	} wakeup;
+	enum lttng_ust_lib_ring_buffer_alloc_types alloc;
+	enum lttng_ust_lib_ring_buffer_sync_types sync;
+	enum lttng_ust_lib_ring_buffer_mode_types mode;
+	enum lttng_ust_lib_ring_buffer_output_types output;
+	enum lttng_ust_lib_ring_buffer_backend_types backend;
+	enum lttng_ust_lib_ring_buffer_oops_types oops;
+	enum lttng_ust_lib_ring_buffer_ipi_types ipi;
+	enum lttng_ust_lib_ring_buffer_wakeup_types wakeup;
 	/*
 	 * tsc_bits: timestamp bits saved at each record.
 	 *   0 and 64 disable the timestamp compression scheme.
@@ -187,6 +211,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];
 };
 
@@ -201,7 +227,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 */
@@ -229,7 +256,21 @@ 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.
+	 */
 };
 
 /**
@@ -245,12 +286,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;
@@ -259,7 +302,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);
 }
 
 /*