X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fringbuffer-config.h;h=5273f321af01be088e8634405545da3220137646;hb=b124e2ec1b9064cdfb82dfa14a5d67ff2e7146c6;hp=151fda13e9add65078828dd08ef6f3dbc098accb;hpb=b728d87e617189fe9898a9492a559ecf949d2348;p=lttng-ust.git

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 151fda13..5273f321 100644
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -21,10 +21,10 @@
 
 #include <errno.h>
 #include "lttng/ust-tracer.h"
-#include "lttng/usterr-signal-safe.h"
 #include <stdint.h>
 #include <stddef.h>
 #include <urcu/arch.h>
+#include <string.h>
 #include "lttng/align.h"
 
 struct lttng_ust_lib_ring_buffer;
@@ -43,7 +43,7 @@ struct lttng_ust_lib_ring_buffer_client_cb {
 	/* Mandatory callbacks */
 
 	/* A static inline version is also required for fast path */
-	u64 (*ring_buffer_clock_read) (struct channel *chan);
+	uint64_t (*ring_buffer_clock_read) (struct channel *chan);
 	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,
@@ -51,10 +51,10 @@ struct lttng_ust_lib_ring_buffer_client_cb {
 
 	/* Slow path only, at subbuffer switch */
 	size_t (*subbuffer_header_size) (void);
-	void (*buffer_begin) (struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
+	void (*buffer_begin) (struct lttng_ust_lib_ring_buffer *buf, uint64_t tsc,
 			      unsigned int subbuf_idx,
 			      struct lttng_ust_shm_handle *handle);
-	void (*buffer_end) (struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
+	void (*buffer_end) (struct lttng_ust_lib_ring_buffer *buf, uint64_t tsc,
 			    unsigned int subbuf_idx, unsigned long data_size,
 			    struct lttng_ust_shm_handle *handle);
 
@@ -80,7 +80,7 @@ struct lttng_ust_lib_ring_buffer_client_cb {
 	void (*record_get) (const struct lttng_ust_lib_ring_buffer_config *config,
 			    struct channel *chan, struct lttng_ust_lib_ring_buffer *buf,
 			    size_t offset, size_t *header_len,
-			    size_t *payload_len, u64 *timestamp,
+			    size_t *payload_len, uint64_t *timestamp,
 			    struct lttng_ust_shm_handle *handle);
 };
 
@@ -123,6 +123,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
 struct lttng_ust_lib_ring_buffer_config {
 	enum {
 		RING_BUFFER_ALLOC_PER_CPU,
@@ -176,6 +177,7 @@ struct lttng_ust_lib_ring_buffer_config {
 	 * callbacks and update the cb pointers.
 	 */
 	int client_type;
+	char padding[LTTNG_UST_RING_BUFFER_CONFIG_PADDING];
 };
 
 /*
@@ -185,6 +187,7 @@ struct lttng_ust_lib_ring_buffer_config {
  * lib_ring_buffer_try_discard_reserve(), lib_ring_buffer_align_ctx() and
  * lib_ring_buffer_write().
  */
+#define LTTNG_UST_RING_BUFFER_CTX_PADDING	24
 struct lttng_ust_lib_ring_buffer_ctx {
 	/* input received by lib_ring_buffer_reserve(), saved here. */
 	struct channel *chan;		/* channel */
@@ -210,8 +213,9 @@ struct lttng_ust_lib_ring_buffer_ctx {
 					 * prior to record header alignment
 					 * padding.
 					 */
-	u64 tsc;			/* time-stamp counter value */
+	uint64_t tsc;			/* time-stamp counter value */
 	unsigned int rflags;		/* reservation flags */
+	char padding[LTTNG_UST_RING_BUFFER_CTX_PADDING];
 };
 
 /**
@@ -236,6 +240,7 @@ 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);
 }
 
 /*
@@ -319,6 +324,4 @@ int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *
 	return 0;
 }
 
-#include <lttng/vatomic.h>
-
 #endif /* _LINUX_RING_BUFFER_CONFIG_H */