X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=106c1e1208634f2fd969fcd311b38a01299a5626;hb=465a0d0493a126c09d0bf469369b8410d4bf73a9;hp=2791c18fd184417e477aefea8fbd6823dcd19adc;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 2791c18f..106c1e12 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -18,13 +18,16 @@
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
 
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include "ringbuffer-config.h"
 #include <usterr-signal-safe.h>
 #include "backend_types.h"
 #include "shm_internal.h"
 #include "shm_types.h"
 #include "vatomic.h"
 
+#define LIB_RING_BUFFER_MAX_NESTING	5
+
 /*
  * A switch is done during tracing or as a final flush after tracing (so it
  * won't write in the new sub-buffer).
@@ -33,7 +36,7 @@ enum switch_mode { SWITCH_ACTIVE, SWITCH_FLUSH };
 
 /* channel: collection of per-cpu ring buffers. */
 #define RB_CHANNEL_PADDING		32
-struct channel {
+struct lttng_ust_lib_ring_buffer_channel {
 	int record_disabled;
 	unsigned long commit_count_mask;	/*
 						 * Commit count mask, removing
@@ -51,13 +54,14 @@ struct channel {
 	int read_timer_enabled;
 
 	int finalized;				/* Has channel been finalized */
-	size_t priv_data_offset;
+	size_t priv_data_offset;		/* Offset of private data channel config */
 	unsigned int nr_streams;		/* Number of streams */
 	struct lttng_ust_shm_handle *handle;
 	/* Extended options. */
 	union {
 		struct {
 			int32_t blocking_timeout_ms;
+			void *priv;		/* Private data pointer. */
 		} s;
 		char padding[RB_CHANNEL_PADDING];
 	} u;
@@ -221,12 +225,61 @@ struct lttng_ust_lib_ring_buffer {
 	char padding[RB_RING_BUFFER_PADDING];
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
+/*
+ * ring buffer private context
+ *
+ * Private context passed to lib_ring_buffer_reserve(), lib_ring_buffer_commit(),
+ * lib_ring_buffer_try_discard_reserve(), lttng_ust_lib_ring_buffer_align_ctx() and
+ * lib_ring_buffer_write().
+ *
+ * This context is allocated on an internal shadow-stack by a successful reserve
+ * operation, used by align/write, and freed by commit.
+ */
+
+struct lttng_ust_lib_ring_buffer_ctx_private {
+	/* input received by lib_ring_buffer_reserve(). */
+	struct lttng_ust_lib_ring_buffer_ctx *pub;
+	struct lttng_ust_lib_ring_buffer_channel *chan; /* channel */
+
+	/* output from lib_ring_buffer_reserve() */
+	int reserve_cpu;			/* processor id updated by the reserve */
+	size_t slot_size;			/* size of the reserved slot */
+	unsigned long buf_offset;		/* offset following the record header */
+	unsigned long pre_offset;		/*
+						 * Initial offset position _before_
+						 * the record is written. Positioned
+						 * prior to record header alignment
+						 * padding.
+						 */
+	uint64_t tsc;				/* time-stamp counter value */
+	unsigned int rflags;			/* reservation flags */
+	void *ip;				/* caller ip address */
+
+	struct lttng_ust_lib_ring_buffer *buf;	/*
+						 * buffer corresponding to processor id
+						 * for this channel
+						 */
+	struct lttng_ust_lib_ring_buffer_backend_pages *backend_pages;
+};
+
 static inline
-void *channel_get_private(struct channel *chan)
+void *channel_get_private_config(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return ((char *) chan) + chan->priv_data_offset;
 }
 
+static inline
+void *channel_get_private(struct lttng_ust_lib_ring_buffer_channel *chan)
+{
+	return chan->u.s.priv;
+}
+
+static inline
+void channel_set_private(struct lttng_ust_lib_ring_buffer_channel *chan, void *priv)
+{
+	chan->u.s.priv = priv;
+}
+
 #ifndef __rb_same_type
 #define __rb_same_type(a, b)	__builtin_types_compatible_p(typeof(a), typeof(b))
 #endif
@@ -238,14 +291,15 @@ void *channel_get_private(struct channel *chan)
  */
 #define CHAN_WARN_ON(c, cond)						\
 	({								\
-		struct channel *__chan;					\
+		struct lttng_ust_lib_ring_buffer_channel *__chan;	\
 		int _____ret = caa_unlikely(cond);				\
 		if (_____ret) {						\
 			if (__rb_same_type(*(c), struct channel_backend))	\
 				__chan = caa_container_of((void *) (c),	\
-							struct channel, \
-							backend);	\
-			else if (__rb_same_type(*(c), struct channel))	\
+					struct lttng_ust_lib_ring_buffer_channel, \
+					backend);			\
+			else if (__rb_same_type(*(c),			\
+					struct lttng_ust_lib_ring_buffer_channel)) \
 				__chan = (void *) (c);			\
 			else						\
 				BUG_ON(1);				\
@@ -255,4 +309,21 @@ void *channel_get_private(struct channel *chan)
 		_____ret = _____ret; /* For clang "unused result". */	\
 	})
 
+/**
+ * lttng_ust_lib_ring_buffer_align_ctx - Align context offset on "alignment"
+ * @ctx: ring buffer context.
+ */
+static inline lttng_ust_notrace
+void lttng_ust_lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+			   size_t alignment);
+static inline
+void lttng_ust_lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+			   size_t alignment)
+{
+	struct lttng_ust_lib_ring_buffer_ctx_private *ctx_private = ctx->priv;
+
+	ctx_private->buf_offset += lttng_ust_lib_ring_buffer_align(ctx_private->buf_offset,
+						 alignment);
+}
+
 #endif /* _LTTNG_RING_BUFFER_FRONTEND_TYPES_H */