X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-ring-buffer-client.h;h=d64af55503994038cce8f0ffc510996bc4d483e8;hb=refs%2Fheads%2Fstable-2.0;hp=abbaf705282b7e07655dd26e6c2f17f3d0703f05;hpb=a3f61e7f689a5fc60b833a773f462989dc6cc78f;p=lttng-ust.git diff --git a/liblttng-ust/ltt-ring-buffer-client.h b/liblttng-ust/ltt-ring-buffer-client.h index abbaf705..d64af555 100644 --- a/liblttng-ust/ltt-ring-buffer-client.h +++ b/liblttng-ust/ltt-ring-buffer-client.h @@ -1,20 +1,35 @@ /* * ltt-ring-buffer-client.h * - * Copyright (C) 2010 - Mathieu Desnoyers - * * LTTng lib ring buffer client template. * - * Dual LGPL v2.1/GPL v2 license. + * 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 */ #include #include #include "lttng/bitfield.h" -#include "lttng/clock.h" +#include "clock.h" #include "ltt-tracer.h" #include "../libringbuffer/frontend_types.h" +#define LTTNG_COMPACT_EVENT_BITS 5 +#define LTTNG_COMPACT_TSC_BITS 27 + /* * Keep the natural field alignment for _each field_ within this structure if * you ever add/remove a field from this header. Packed attribute is not used @@ -48,7 +63,7 @@ struct packet_header { }; -static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan) +static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan) { return trace_clock_read64(); } @@ -110,8 +125,8 @@ unsigned char record_header_size(const struct lttng_ust_lib_ring_buffer_config * if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTT_RFLAG_EXTENDED))) { offset += sizeof(uint32_t); /* id and timestamp */ } else { - /* Minimum space taken by 5-bit id */ - offset += sizeof(uint8_t); + /* Minimum space taken by LTTNG_COMPACT_EVENT_BITS id */ + offset += (LTTNG_COMPACT_EVENT_BITS + CHAR_BIT - 1) / CHAR_BIT; /* Align extended struct on largest member */ offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t)); offset += sizeof(uint32_t); /* id */ @@ -177,8 +192,14 @@ void ltt_write_event_header(const struct lttng_ust_lib_ring_buffer_config *confi { uint32_t id_time = 0; - bt_bitfield_write(&id_time, uint32_t, 0, 5, event_id); - bt_bitfield_write(&id_time, uint32_t, 5, 27, ctx->tsc); + bt_bitfield_write(&id_time, uint32_t, + 0, + LTTNG_COMPACT_EVENT_BITS, + event_id); + bt_bitfield_write(&id_time, uint32_t, + LTTNG_COMPACT_EVENT_BITS, + LTTNG_COMPACT_TSC_BITS, + ctx->tsc); lib_ring_buffer_write(config, ctx, &id_time, sizeof(id_time)); break; } @@ -219,14 +240,23 @@ void ltt_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config * if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTT_RFLAG_EXTENDED))) { uint32_t id_time = 0; - bt_bitfield_write(&id_time, uint32_t, 0, 5, event_id); - bt_bitfield_write(&id_time, uint32_t, 5, 27, ctx->tsc); + bt_bitfield_write(&id_time, uint32_t, + 0, + LTTNG_COMPACT_EVENT_BITS, + event_id); + bt_bitfield_write(&id_time, uint32_t, + LTTNG_COMPACT_EVENT_BITS, + LTTNG_COMPACT_TSC_BITS, + ctx->tsc); lib_ring_buffer_write(config, ctx, &id_time, sizeof(id_time)); } else { uint8_t id = 0; uint64_t timestamp = ctx->tsc; - bt_bitfield_write(&id, uint8_t, 0, 5, 31); + bt_bitfield_write(&id, uint8_t, + 0, + LTTNG_COMPACT_EVENT_BITS, + 31); lib_ring_buffer_write(config, ctx, &id, sizeof(id)); /* Align extended struct on largest member */ lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t)); @@ -267,7 +297,7 @@ void ltt_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config * static const struct lttng_ust_lib_ring_buffer_config client_config; -static u64 client_ring_buffer_clock_read(struct channel *chan) +static uint64_t client_ring_buffer_clock_read(struct channel *chan) { return lib_ring_buffer_clock_read(chan); } @@ -294,7 +324,7 @@ static size_t client_packet_header_size(void) return offsetof(struct packet_header, ctx.header_end); } -static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, +static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t tsc, unsigned int subbuf_idx, struct lttng_ust_shm_handle *handle) { @@ -321,7 +351,7 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, * offset is assumed to never be 0 here : never deliver a completely empty * subbuffer. data_size is between 1 and subbuf_size. */ -static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, +static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t tsc, unsigned int subbuf_idx, unsigned long data_size, struct lttng_ust_shm_handle *handle) { @@ -336,11 +366,8 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, header->ctx.timestamp_end = tsc; header->ctx.content_size = data_size * CHAR_BIT; /* in bits */ header->ctx.packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */ - /* - * We do not care about the records lost count, because the metadata - * channel waits and retry. - */ - (void) lib_ring_buffer_get_records_lost_full(&client_config, buf); + + records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf); records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf); records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf); header->ctx.events_discarded = records_lost; @@ -365,7 +392,7 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = { .cb.buffer_create = client_buffer_create, .cb.buffer_finalize = client_buffer_finalize, - .tsc_bits = 32, + .tsc_bits = LTTNG_COMPACT_TSC_BITS, .alloc = RING_BUFFER_ALLOC_PER_CPU, .sync = RING_BUFFER_SYNC_GLOBAL, .mode = RING_BUFFER_MODE_TEMPLATE, @@ -385,8 +412,9 @@ struct ltt_channel *_channel_create(const char *name, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, unsigned int read_timer_interval, - int *shm_fd, int *wait_fd, - uint64_t *memory_map_size) + int **shm_fd, int **wait_fd, + uint64_t **memory_map_size, + struct ltt_channel *chan_priv_init) { void *priv; struct ltt_channel *ltt_chan = NULL; @@ -394,6 +422,7 @@ struct ltt_channel *_channel_create(const char *name, handle = channel_create(&client_config, name, &priv, __alignof__(*ltt_chan), sizeof(*ltt_chan), + chan_priv_init, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval, shm_fd, wait_fd, memory_map_size); @@ -414,8 +443,8 @@ void ltt_channel_destroy(struct ltt_channel *ltt_chan) static struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan, struct lttng_ust_shm_handle *handle, - int *shm_fd, int *wait_fd, - uint64_t *memory_map_size) + int **shm_fd, int **wait_fd, + uint64_t **memory_map_size) { struct lttng_ust_lib_ring_buffer *buf; int cpu; @@ -519,8 +548,8 @@ int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle) int cpu; for_each_channel_cpu(cpu, chan) { - int shm_fd, wait_fd; - uint64_t memory_map_size; + int *shm_fd, *wait_fd; + uint64_t *memory_map_size; buf = channel_get_ring_buffer(&client_config, chan, cpu, handle, &shm_fd, &wait_fd,