projects / lttng-ust.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Namespace 'lttng_alignof' to 'lttng_ust_rb_alignof'
[lttng-ust.git] / liblttng-ust / lttng-ring-buffer-client.h
diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 32b812d5e08ccb9cddc8eec1290c6b53de9f7f3f..350cf0edd15f19bcf3230e0ad322ab8405064ffb 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -6,6 +6,7 @@
  * LTTng lib ring buffer client template.
  */
 
+#include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -80,7 +81,7 @@ size_t ctx_get_aligned_size(size_t offset, struct lttng_ust_ctx *ctx,
 
        if (caa_likely(!ctx))
                return 0;
-       offset += lib_ring_buffer_align(offset, ctx->largest_align);
+       offset += lttng_ust_lib_ring_buffer_align(offset, ctx->largest_align);
        offset += ctx_len;
        return offset - orig_offset;
 }
@@ -130,7 +131,7 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
 
        if (caa_likely(!ctx))
                return;
-       lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
+       lttng_ust_lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
        for (i = 0; i < ctx->nr_fields; i++) {
                if (mode == APP_CTX_ENABLED) {
                        ctx->fields[i]->record(ctx->fields[i], bufctx, chan);
@@ -181,7 +182,7 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
 
        switch (lttng_chan->priv->header_type) {
        case 1: /* compact */
-               padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
+               padding = lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint32_t));
                offset += padding;
                if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
                        offset += sizeof(uint32_t);     /* id and timestamp */
@@ -189,24 +190,24 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
                        /* 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 += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
                        offset += sizeof(uint32_t);     /* id */
-                       offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t));
+                       offset += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
                        offset += sizeof(uint64_t);     /* timestamp */
                }
                break;
        case 2: /* large */
-               padding = lib_ring_buffer_align(offset, lttng_alignof(uint16_t));
+               padding = lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint16_t));
                offset += padding;
                offset += sizeof(uint16_t);
                if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
-                       offset += lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
+                       offset += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint32_t));
                        offset += sizeof(uint32_t);     /* timestamp */
                } else {
                        /* Align extended struct on largest member */
-                       offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t));
+                       offset += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
                        offset += sizeof(uint32_t);     /* id */
-                       offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t));
+                       offset += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uint64_t));
                        offset += sizeof(uint64_t);     /* timestamp */
                }
                break;
@@ -273,7 +274,7 @@ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con
                uint16_t id = event_id;
 
                lib_ring_buffer_write(config, ctx, &id, sizeof(id));
-               lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint32_t));
+               lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(uint32_t));
                lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
                break;
        }
@@ -283,7 +284,7 @@ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con
 
        ctx_record(ctx, lttng_chan, client_ctx->chan_ctx, APP_CTX_ENABLED);
        ctx_record(ctx, lttng_chan, client_ctx->event_ctx, APP_CTX_ENABLED);
-       lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
+       lttng_ust_lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
        return;
 
@@ -323,9 +324,9 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
                                        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));
+                       lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(uint64_t));
                        lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id));
-                       lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t));
+                       lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(uint64_t));
                        lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
                }
                break;
@@ -336,7 +337,7 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
                        uint16_t id = event_id;
 
                        lib_ring_buffer_write(config, ctx, &id, sizeof(id));
-                       lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint32_t));
+                       lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(uint32_t));
                        lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
                } else {
                        uint16_t id = 65535;
@@ -344,9 +345,9 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
 
                        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));
+                       lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(uint64_t));
                        lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id));
-                       lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t));
+                       lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(uint64_t));
                        lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
                }
                break;
@@ -356,7 +357,7 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
        }
        ctx_record(ctx, lttng_chan, client_ctx->chan_ctx, APP_CTX_ENABLED);
        ctx_record(ctx, lttng_chan, client_ctx->event_ctx, APP_CTX_ENABLED);
-       lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
+       lttng_ust_lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
 
 static const struct lttng_ust_lib_ring_buffer_config client_config;
@@ -481,9 +482,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 +496,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 +510,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 +524,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 +538,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 +552,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 +563,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 +586,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 +677,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 +688,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 +696,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 +711,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 +738,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 +746,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
@@ -764,54 +764,44 @@ void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *s
 }
 
 static
-void lttng_event_strcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+void lttng_event_pstrcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                     const char *src, size_t len)
 {
-       lib_ring_buffer_strcpy(&client_config, ctx, src, len, '\0');
+       lib_ring_buffer_pstrcpy(&client_config, ctx, src, len, '\0');
 }
 
-#if 0
 static
-wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
+int lttng_is_finalized(struct lttng_ust_channel_buffer *chan)
 {
-       return &chan->read_wait;
-}
+       struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan;
 
-static
-wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
-{
-       return &chan->hp_wait;
+       return lib_ring_buffer_channel_is_finalized(rb_chan);
 }
-#endif //0
 
 static
-int lttng_is_finalized(struct lttng_ust_lib_ring_buffer_channel *chan)
+int lttng_is_disabled(struct lttng_ust_channel_buffer *chan)
 {
-       return lib_ring_buffer_channel_is_finalized(chan);
-}
+       struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan;
 
-static
-int lttng_is_disabled(struct lttng_ust_lib_ring_buffer_channel *chan)
-{
-       return lib_ring_buffer_channel_is_disabled(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;
 }
@@ -819,8 +809,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 = &lttng_relay_transport.ops,
                        .channel_create = _channel_create,
                        .channel_destroy = lttng_channel_destroy,
@@ -833,7 +823,7 @@ static struct lttng_transport lttng_relay_transport = {
                .event_commit = lttng_event_commit,
                .event_write = lttng_event_write,
                .event_strcpy = lttng_event_strcpy,
-               .event_strcpy_pad = lttng_event_strcpy_pad,
+               .event_pstrcpy_pad = lttng_event_pstrcpy_pad,
        },
        .client_config = &client_config,
 };
LTTng 2.0 Userspace Tracer
This page took 0.036862 seconds and 4 git commands to generate.