X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=835647683ba78e8d1a9e642dd922f17f98c4cd7c;hb=f574bfb4d81b26d3cfc0243868d138e33470a950;hp=43300f6a74ddec2324fbfb9f0d0c6dd8bcbb1786;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 43300f6a..83564768 100644
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -1,33 +1,16 @@
-#ifndef _LTTNG_RING_BUFFER_FRONTEND_TYPES_H
-#define _LTTNG_RING_BUFFER_FRONTEND_TYPES_H
-
 /*
- * libringbuffer/frontend_types.h
- *
- * Ring Buffer Library Synchronization Header (types).
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2005-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Author:
- *	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Ring Buffer Library Synchronization Header (types).
  *
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
 
+#ifndef _LTTNG_RING_BUFFER_FRONTEND_TYPES_H
+#define _LTTNG_RING_BUFFER_FRONTEND_TYPES_H
+
 #include <stdint.h>
 #include <string.h>
 #include <time.h>	/* for timer_t */
@@ -35,7 +18,8 @@
 #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"
@@ -50,7 +34,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
@@ -68,13 +52,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;
@@ -239,11 +224,23 @@ struct lttng_ust_lib_ring_buffer {
 } __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 
 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
@@ -255,14 +252,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);				\