X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;h=956de9fde1c62215dd7df343e743d44486fca40e;hb=f0fde1c3984721c0660c7d5a1377db74b6c03a70;hp=64940163d10250c4ba0e2dcbc60ee8df3f7e774d;hpb=e56bb47c3af00db3bc9e2dea711bef4882e6ef4c;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h index 64940163..956de9fd 100644 --- a/liblttng-ust/lttng-ring-buffer-metadata-client.h +++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h @@ -1,28 +1,17 @@ /* - * lttng-ring-buffer-client.h - * - * LTTng lib ring buffer client template. + * SPDX-License-Identifier: LGPL-2.1-only * * Copyright (C) 2010-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 + * LTTng lib ring buffer client template. */ +#include #include -#include -#include "lttng/bitfield.h" + +#include +#include "ust-bitfield.h" +#include "ust-compat.h" #include "lttng-tracer.h" #include "../libringbuffer/frontend_types.h" @@ -46,14 +35,15 @@ struct metadata_record_header { static const struct lttng_ust_lib_ring_buffer_config client_config; -static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan) +static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan) { return 0; } static inline size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, - struct channel *chan, size_t offset, + struct lttng_ust_lib_ring_buffer_channel *chan, + size_t offset, size_t *pre_header_padding, struct lttng_ust_lib_ring_buffer_ctx *ctx, void *client_ctx) @@ -64,14 +54,15 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, #include "../libringbuffer/api.h" #include "lttng-rb-clients.h" -static uint64_t client_ring_buffer_clock_read(struct channel *chan) +static uint64_t client_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan) { return 0; } static size_t client_record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, - struct channel *chan, size_t offset, + struct lttng_ust_lib_ring_buffer_channel *chan, + size_t offset, size_t *pre_header_padding, struct lttng_ust_lib_ring_buffer_ctx *ctx, void *client_ctx) @@ -95,7 +86,7 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t unsigned int subbuf_idx, struct lttng_ust_shm_handle *handle) { - struct channel *chan = shmp(handle, buf->backend.chan); + struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan); struct metadata_packet_header *header = (struct metadata_packet_header *) lib_ring_buffer_offset_address(&buf->backend, @@ -126,7 +117,7 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts unsigned int subbuf_idx, unsigned long data_size, struct lttng_ust_shm_handle *handle) { - struct channel *chan = shmp(handle, buf->backend.chan); + struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan); struct metadata_packet_header *header = (struct metadata_packet_header *) lib_ring_buffer_offset_address(&buf->backend, @@ -138,7 +129,7 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts if (!header) return; header->content_size = data_size * CHAR_BIT; /* in bits */ - header->packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */ + header->packet_size = LTTNG_UST_PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */ /* * We do not care about the records lost count, because the metadata * channel waits and retry. @@ -198,8 +189,6 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = { .cb_ptr = &client_cb.parent, }; -const struct lttng_ust_client_lib_ring_buffer_client_cb *LTTNG_CLIENT_CALLBACKS = &client_cb; - static struct lttng_channel *_channel_create(const char *name, void *buf_addr, @@ -208,35 +197,46 @@ struct lttng_channel *_channel_create(const char *name, unsigned int read_timer_interval, unsigned char *uuid, uint32_t chan_id, - const int *stream_fds, int nr_stream_fds) + const int *stream_fds, int nr_stream_fds, + int64_t blocking_timeout) { - struct lttng_channel chan_priv_init; + struct lttng_ust_abi_channel_config chan_priv_init; struct lttng_ust_shm_handle *handle; struct lttng_channel *lttng_chan; - void *priv; + + lttng_chan = zmalloc(sizeof(struct lttng_channel)); + if (!lttng_chan) + return NULL; + memcpy(lttng_chan->uuid, uuid, LTTNG_UST_UUID_LEN); + lttng_chan->id = chan_id; memset(&chan_priv_init, 0, sizeof(chan_priv_init)); memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN); chan_priv_init.id = chan_id; + handle = channel_create(&client_config, name, - &priv, __alignof__(struct lttng_channel), + __alignof__(struct lttng_channel), sizeof(struct lttng_channel), &chan_priv_init, - buf_addr, subbuf_size, num_subbuf, + lttng_chan, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval, - stream_fds, nr_stream_fds); + stream_fds, nr_stream_fds, blocking_timeout); if (!handle) - return NULL; - lttng_chan = priv; + goto error; lttng_chan->handle = handle; lttng_chan->chan = shmp(handle, handle->chan); return lttng_chan; + +error: + free(lttng_chan); + return NULL; } static void lttng_channel_destroy(struct lttng_channel *chan) { channel_destroy(chan->chan, chan->handle, 1); + free(chan); } static @@ -247,12 +247,9 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t even ret = lib_ring_buffer_reserve(&client_config, ctx, NULL); if (ret) return ret; - if (caa_likely(ctx->ctx_len - >= sizeof(struct lttng_ust_lib_ring_buffer_ctx))) { - if (lib_ring_buffer_backend_get_pages(&client_config, ctx, - &ctx->backend_pages)) - return -EPERM; - } + if (lib_ring_buffer_backend_get_pages(&client_config, ctx, + &ctx->backend_pages)) + return -EPERM; return 0; } @@ -270,8 +267,8 @@ void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *sr } static -size_t lttng_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle *handle) - +size_t lttng_packet_avail_size(struct lttng_ust_lib_ring_buffer_channel *chan, + struct lttng_ust_shm_handle *handle) { unsigned long o_begin; struct lttng_ust_lib_ring_buffer *buf; @@ -288,32 +285,33 @@ size_t lttng_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle #if 0 static -wait_queue_head_t *lttng_get_reader_wait_queue(struct channel *chan) +wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan) { return &chan->read_wait; } static -wait_queue_head_t *lttng_get_hp_wait_queue(struct channel *chan) +wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan) { return &chan->hp_wait; } #endif //0 static -int lttng_is_finalized(struct channel *chan) +int lttng_is_finalized(struct lttng_ust_lib_ring_buffer_channel *chan) { return lib_ring_buffer_channel_is_finalized(chan); } static -int lttng_is_disabled(struct channel *chan) +int lttng_is_disabled(struct lttng_ust_lib_ring_buffer_channel *chan) { return lib_ring_buffer_channel_is_disabled(chan); } static -int lttng_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle) +int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan, + struct lttng_ust_shm_handle *handle) { struct lttng_ust_lib_ring_buffer *buf; int shm_fd, wait_fd, wakeup_fd; @@ -330,17 +328,20 @@ int lttng_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle static struct lttng_transport lttng_relay_transport = { .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap", .ops = { - .channel_create = _channel_create, - .channel_destroy = lttng_channel_destroy, + .struct_size = sizeof(struct lttng_ust_channel_ops), + + .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, { + .pub = <tng_relay_transport.ops, + .channel_create = _channel_create, + .channel_destroy = lttng_channel_destroy, + .packet_avail_size = lttng_packet_avail_size, + .is_finalized = lttng_is_finalized, + .is_disabled = lttng_is_disabled, + .flush_buffer = lttng_flush_buffer, + }), .event_reserve = lttng_event_reserve, .event_commit = lttng_event_commit, .event_write = lttng_event_write, - .packet_avail_size = lttng_packet_avail_size, - //.get_reader_wait_queue = lttng_get_reader_wait_queue, - //.get_hp_wait_queue = lttng_get_hp_wait_queue, - .is_finalized = lttng_is_finalized, - .is_disabled = lttng_is_disabled, - .flush_buffer = lttng_flush_buffer, }, .client_config = &client_config, };