X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=9ecf452498435185c1f80cbe9553fde6ca3cbd11;hb=eae3c72949135b48639440468dc78ea1d5e937e9;hp=73f3deb8e341d4d337af9329a07fa7cd296707bc;hpb=a40b5b8cd4af87564b297e343de14779c1bfc11a;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h index 73f3deb8..9ecf4524 100644 --- a/liblttng-ust/lttng-ring-buffer-client.h +++ b/liblttng-ust/lttng-ring-buffer-client.h @@ -481,9 +481,10 @@ static struct packet_header *client_packet_header(struct lttng_ust_lib_ring_buff } static int client_timestamp_begin(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *timestamp_begin) { + struct lttng_ust_shm_handle *handle = chan->handle; struct packet_header *header; header = client_packet_header(buf, handle); @@ -494,9 +495,10 @@ static int client_timestamp_begin(struct lttng_ust_lib_ring_buffer *buf, } static int client_timestamp_end(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *timestamp_end) { + struct lttng_ust_shm_handle *handle = chan->handle; struct packet_header *header; header = client_packet_header(buf, handle); @@ -507,9 +509,10 @@ static int client_timestamp_end(struct lttng_ust_lib_ring_buffer *buf, } static int client_events_discarded(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *events_discarded) { + struct lttng_ust_shm_handle *handle = chan->handle; struct packet_header *header; header = client_packet_header(buf, handle); @@ -520,9 +523,10 @@ static int client_events_discarded(struct lttng_ust_lib_ring_buffer *buf, } static int client_content_size(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *content_size) { + struct lttng_ust_shm_handle *handle = chan->handle; struct packet_header *header; header = client_packet_header(buf, handle); @@ -533,9 +537,10 @@ static int client_content_size(struct lttng_ust_lib_ring_buffer *buf, } static int client_packet_size(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *packet_size) { + struct lttng_ust_shm_handle *handle = chan->handle; struct packet_header *header; header = client_packet_header(buf, handle); @@ -546,11 +551,9 @@ static int client_packet_size(struct lttng_ust_lib_ring_buffer *buf, } static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *stream_id) { - struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, - buf->backend.chan); struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(chan); *stream_id = lttng_chan->priv->id; @@ -559,21 +562,19 @@ static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf, } static int client_current_timestamp(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *ts) { - struct lttng_ust_lib_ring_buffer_channel *chan; - - chan = shmp(handle, handle->chan); *ts = client_ring_buffer_clock_read(chan); return 0; } static int client_sequence_number(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *seq) { + struct lttng_ust_shm_handle *handle = chan->handle; struct packet_header *header; header = client_packet_header(buf, handle); @@ -584,7 +585,7 @@ static int client_sequence_number(struct lttng_ust_lib_ring_buffer *buf, } static int client_instance_id(struct lttng_ust_lib_ring_buffer *buf, - struct lttng_ust_shm_handle *handle, + struct lttng_ust_lib_ring_buffer_channel *chan, uint64_t *id) { *id = buf->backend.cpu; @@ -675,8 +676,7 @@ struct lttng_ust_channel_buffer *_channel_create(const char *name, stream_fds, nr_stream_fds, blocking_timeout); if (!handle) goto error; - lttng_chan_buf->handle = handle; - lttng_chan_buf->chan = shmp(handle, handle->chan); + lttng_chan_buf->priv->rb_chan = shmp(handle, handle->chan); return lttng_chan_buf; error: @@ -687,7 +687,7 @@ error: static void lttng_channel_destroy(struct lttng_ust_channel_buffer *lttng_chan_buf) { - channel_destroy(lttng_chan_buf->chan, lttng_chan_buf->handle, 1); + channel_destroy(lttng_chan_buf->priv->rb_chan, lttng_chan_buf->priv->rb_chan->handle, 1); lttng_ust_free_channel_common(lttng_chan_buf->parent); } @@ -695,12 +695,13 @@ static int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id) { - struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(ctx->chan); struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv; struct lttng_ust_event_recorder *event_recorder = lttng_ctx->event_recorder; + struct lttng_ust_channel_buffer *lttng_chan = event_recorder->chan; struct lttng_client_ctx client_ctx; - int ret, cpu; + int ret; + ctx->chan = lttng_chan->priv->rb_chan; client_ctx.chan_ctx = lttng_ust_rcu_dereference(lttng_chan->priv->ctx); client_ctx.event_ctx = lttng_ust_rcu_dereference(event_recorder->priv->ctx); /* Compute internal size of context structures. */ @@ -709,10 +710,8 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, ctx_get_struct_size(client_ctx.event_ctx, &client_ctx.event_context_len, APP_CTX_ENABLED); - cpu = lib_ring_buffer_get_cpu(&client_config); - if (cpu < 0) + if (lib_ring_buffer_nesting_inc(&client_config) < 0) return -EPERM; - ctx->cpu = cpu; switch (lttng_chan->priv->header_type) { case 1: /* compact */ @@ -738,7 +737,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, lttng_write_event_header(&client_config, ctx, &client_ctx, event_id); return 0; put: - lib_ring_buffer_put_cpu(&client_config); + lib_ring_buffer_nesting_dec(&client_config); return ret; } @@ -746,7 +745,7 @@ static void lttng_event_commit(struct lttng_ust_lib_ring_buffer_ctx *ctx) { lib_ring_buffer_commit(&client_config, ctx); - lib_ring_buffer_put_cpu(&client_config); + lib_ring_buffer_nesting_dec(&client_config); } static @@ -763,48 +762,45 @@ void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *s lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#'); } -#if 0 static -wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan) +void lttng_event_pstrcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx, + const char *src, size_t len) { - return &chan->read_wait; + lib_ring_buffer_pstrcpy(&client_config, ctx, src, len, '\0'); } static -wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan) +int lttng_is_finalized(struct lttng_ust_channel_buffer *chan) { - return &chan->hp_wait; -} -#endif //0 + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; -static -int lttng_is_finalized(struct lttng_ust_lib_ring_buffer_channel *chan) -{ - return lib_ring_buffer_channel_is_finalized(chan); + return lib_ring_buffer_channel_is_finalized(rb_chan); } static -int lttng_is_disabled(struct lttng_ust_lib_ring_buffer_channel *chan) +int lttng_is_disabled(struct lttng_ust_channel_buffer *chan) { - return lib_ring_buffer_channel_is_disabled(chan); + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; + + return lib_ring_buffer_channel_is_disabled(rb_chan); } static -int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan, - struct lttng_ust_shm_handle *handle) +int lttng_flush_buffer(struct lttng_ust_channel_buffer *chan) { + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; struct lttng_ust_lib_ring_buffer *buf; int cpu; - for_each_channel_cpu(cpu, chan) { + for_each_channel_cpu(cpu, rb_chan) { int shm_fd, wait_fd, wakeup_fd; uint64_t memory_map_size; - buf = channel_get_ring_buffer(&client_config, chan, - cpu, handle, &shm_fd, &wait_fd, + buf = channel_get_ring_buffer(&client_config, rb_chan, + cpu, rb_chan->handle, &shm_fd, &wait_fd, &wakeup_fd, &memory_map_size); lib_ring_buffer_switch(&client_config, buf, - SWITCH_ACTIVE, handle); + SWITCH_ACTIVE, rb_chan->handle); } return 0; } @@ -812,8 +808,8 @@ int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan, static struct lttng_transport lttng_relay_transport = { .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap", .ops = { - .struct_size = sizeof(struct lttng_ust_channel_ops), - .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, { + .struct_size = sizeof(struct lttng_ust_channel_buffer_ops), + .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_buffer_ops_private, { .pub = <tng_relay_transport.ops, .channel_create = _channel_create, .channel_destroy = lttng_channel_destroy, @@ -826,6 +822,7 @@ static struct lttng_transport lttng_relay_transport = { .event_commit = lttng_event_commit, .event_write = lttng_event_write, .event_strcpy = lttng_event_strcpy, + .event_pstrcpy_pad = lttng_event_pstrcpy_pad, }, .client_config = &client_config, };