-#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 */
#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"
/* 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
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;
- char padding[RB_CHANNEL_PADDING];
+ /* Extended options. */
+ union {
+ struct {
+ int32_t blocking_timeout_ms;
+ void *priv; /* Private data pointer. */
+ } s;
+ char padding[RB_CHANNEL_PADDING];
+ } u;
/*
* Associated backend contains a variable-length array. Needs to
* be last member.
DECLARE_SHMP(struct commit_counters_cold, commit_cold);
/* Commit count per sub-buffer */
+ DECLARE_SHMP(uint64_t, ts_end); /*
+ * timestamp_end per sub-buffer.
+ * Time is sampled by the
+ * switch_*_end() callbacks
+ * which are the last space
+ * reservation performed in the
+ * sub-buffer before it can be
+ * fully committed and
+ * delivered. This time value is
+ * then read by the deliver
+ * callback, performed by the
+ * last commit before the buffer
+ * becomes readable.
+ */
long active_readers; /*
* Active readers count
* standard atomic access (shared)
} __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
*/
#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); \