X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Ffrontend_types.h;h=4e7d2e8f7526bcca829161b683af1fed2d60c277;hb=f1324c1158b8ad5b9dd8bcc55e2a1a26ab2113ae;hp=43300f6a74ddec2324fbfb9f0d0c6dd8bcbb1786;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h index 43300f6a..4e7d2e8f 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 * - * 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 + * 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 #include #include /* for timer_t */ @@ -35,13 +18,16 @@ #include #include -#include +#include +#include "ringbuffer-config.h" #include #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). @@ -50,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 @@ -68,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; @@ -238,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 @@ -255,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); \ @@ -272,4 +309,22 @@ 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 +void lttng_ust_lib_ring_buffer_align_ctx(struct lttng_ust_lib_ring_buffer_ctx *ctx, + size_t alignment) + lttng_ust_notrace; +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 */