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

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index c95d35cb..f668e949 100644
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -1,33 +1,15 @@
-#ifndef _LTTNG_RING_BUFFER_CONFIG_H
-#define _LTTNG_RING_BUFFER_CONFIG_H
-
 /*
- * lttng/ringbuffer-config.h
+ * SPDX-License-Identifier: MIT
  *
- * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Ring buffer configuration header. Note: after declaring the standard inline
  * functions, clients should also include linux/ringbuffer/api.h.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#ifndef _LTTNG_RING_BUFFER_CONFIG_H
+#define _LTTNG_RING_BUFFER_CONFIG_H
+
 #include <errno.h>
 #include "lttng/ust-tracer.h"
 #include <stdint.h>
@@ -57,7 +39,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);
@@ -227,9 +210,10 @@ 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 - sizeof(int) - sizeof(void *) - sizeof(void *))
+#define LTTNG_UST_RING_BUFFER_CTX_PADDING	64
 struct lttng_ust_lib_ring_buffer_ctx {
+	uint32_t struct_size;		/* Size of this structure. */
+
 	/* input received by lib_ring_buffer_reserve(), saved here. */
 	struct channel *chan;		/* channel */
 	void *priv;			/* client private data */
@@ -256,21 +240,8 @@ struct lttng_ust_lib_ring_buffer_ctx {
 					 */
 	uint64_t tsc;			/* time-stamp counter value */
 	unsigned int rflags;		/* reservation flags */
-	/*
-	 * 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;
 };
 
 /**
@@ -286,15 +257,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,
-			      void *priv2);
+			      int cpu, struct lttng_ust_shm_handle *handle);
 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,
-			      void *priv2)
+			      int cpu, struct lttng_ust_shm_handle *handle)
 {
+	ctx->struct_size = sizeof(struct lttng_ust_lib_ring_buffer_ctx);
 	ctx->chan = chan;
 	ctx->priv = priv;
 	ctx->data_size = data_size;
@@ -302,10 +272,7 @@ void lib_ring_buffer_ctx_init(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 	ctx->cpu = cpu;
 	ctx->rflags = 0;
 	ctx->handle = handle;
-	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);
 }
 
 /*
@@ -344,7 +311,7 @@ unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type);
 static inline
 unsigned int lib_ring_buffer_align(size_t align_drift, size_t size_of_type)
 {
-	return offset_align(align_drift, size_of_type);
+	return lttng_ust_offset_align(align_drift, size_of_type);
 }
 
 #else