projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move channel context to private structures
[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 188efb0fe12960880b0c1ae5d5cdcb8455a4b944..871170366429a4b329561395acf243c839e2ac5d 100644
(file)
--- a/
liblttng-ust/lttng-ring-buffer-client.h
+++ b/
liblttng-ust/lttng-ring-buffer-client.h
@@
-10,6
+10,7
@@
#include <stdint.h>
#include <ust-events-internal.h>
#include <stdint.h>
#include <ust-events-internal.h>
+#include <lttng/urcu/pointer.h>
#include "ust-bitfield.h"
#include "ust-compat.h"
#include "clock.h"
#include "ust-bitfield.h"
#include "ust-compat.h"
#include "clock.h"
@@
-62,6
+63,7
@@
struct packet_header {
struct lttng_client_ctx {
size_t packet_context_len;
size_t event_context_len;
struct lttng_client_ctx {
size_t packet_context_len;
size_t event_context_len;
+ struct lttng_ust_ctx *chan_ctx;
};
static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
};
static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
@@
-119,7
+121,7
@@
void ctx_get_struct_size(struct lttng_ust_ctx *ctx, size_t *ctx_len,
static inline
void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
static inline
void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
- struct lttng_
channel
*chan,
+ struct lttng_
ust_channel_buffer
*chan,
struct lttng_ust_ctx *ctx,
enum app_ctx_mode mode)
{
struct lttng_ust_ctx *ctx,
enum app_ctx_mode mode)
{
@@
-172,12
+174,12
@@
size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
struct lttng_client_ctx *client_ctx)
{
struct lttng_ust_lib_ring_buffer_ctx *ctx,
struct lttng_client_ctx *client_ctx)
{
- struct lttng_
channel
*lttng_chan = channel_get_private(chan);
+ struct lttng_
ust_channel_buffer
*lttng_chan = channel_get_private(chan);
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
size_t orig_offset = offset;
size_t padding;
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
size_t orig_offset = offset;
size_t padding;
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->
priv->
header_type) {
case 1: /* compact */
padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
offset += padding;
case 1: /* compact */
padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t));
offset += padding;
@@
-212,7
+214,7
@@
size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
padding = 0;
WARN_ON_ONCE(1);
}
padding = 0;
WARN_ON_ONCE(1);
}
- offset += ctx_get_aligned_size(offset,
lttng
_ctx->chan_ctx,
+ offset += ctx_get_aligned_size(offset,
client
_ctx->chan_ctx,
client_ctx->packet_context_len);
offset += ctx_get_aligned_size(offset, lttng_ctx->event_ctx,
client_ctx->event_context_len);
client_ctx->packet_context_len);
offset += ctx_get_aligned_size(offset, lttng_ctx->event_ctx,
client_ctx->event_context_len);
@@
-226,6
+228,7
@@
size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
static
void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
static
void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ struct lttng_client_ctx *client_ctx,
uint32_t event_id);
/*
uint32_t event_id);
/*
@@
-240,15
+243,16
@@
void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
static __inline__
void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
static __inline__
void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ struct lttng_client_ctx *client_ctx,
uint32_t event_id)
{
uint32_t event_id)
{
- struct lttng_
channel
*lttng_chan = channel_get_private(ctx->chan);
+ struct lttng_
ust_channel_buffer
*lttng_chan = channel_get_private(ctx->chan);
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
if (caa_unlikely(ctx->rflags))
goto slow_path;
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
if (caa_unlikely(ctx->rflags))
goto slow_path;
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->
priv->
header_type) {
case 1: /* compact */
{
uint32_t id_time = 0;
case 1: /* compact */
{
uint32_t id_time = 0;
@@
-278,25
+282,26
@@
void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con
WARN_ON_ONCE(1);
}
WARN_ON_ONCE(1);
}
- ctx_record(ctx, lttng_chan,
lttng
_ctx->chan_ctx, APP_CTX_ENABLED);
+ ctx_record(ctx, lttng_chan,
client
_ctx->chan_ctx, APP_CTX_ENABLED);
ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
return;
slow_path:
ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
return;
slow_path:
- lttng_write_event_header_slow(config, ctx, event_id);
+ lttng_write_event_header_slow(config, ctx,
client_ctx,
event_id);
}
static
void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
}
static
void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ struct lttng_client_ctx *client_ctx,
uint32_t event_id)
{
uint32_t event_id)
{
- struct lttng_
channel
*lttng_chan = channel_get_private(ctx->chan);
+ struct lttng_
ust_channel_buffer
*lttng_chan = channel_get_private(ctx->chan);
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->
priv->
header_type) {
case 1: /* compact */
if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
uint32_t id_time = 0;
case 1: /* compact */
if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
uint32_t id_time = 0;
@@
-351,7
+356,7
@@
void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
- ctx_record(ctx, lttng_chan,
lttng
_ctx->chan_ctx, APP_CTX_ENABLED);
+ ctx_record(ctx, lttng_chan,
client
_ctx->chan_ctx, APP_CTX_ENABLED);
ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
}
ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
}
@@
-397,15
+402,15
@@
static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t
lib_ring_buffer_offset_address(&buf->backend,
subbuf_idx * chan->backend.subbuf_size,
handle);
lib_ring_buffer_offset_address(&buf->backend,
subbuf_idx * chan->backend.subbuf_size,
handle);
- struct lttng_
channel
*lttng_chan = channel_get_private(chan);
+ struct lttng_
ust_channel_buffer
*lttng_chan = channel_get_private(chan);
uint64_t cnt = shmp_index(handle, buf->backend.buf_cnt, subbuf_idx)->seq_cnt;
assert(header);
if (!header)
return;
header->magic = CTF_MAGIC_NUMBER;
uint64_t cnt = shmp_index(handle, buf->backend.buf_cnt, subbuf_idx)->seq_cnt;
assert(header);
if (!header)
return;
header->magic = CTF_MAGIC_NUMBER;
- memcpy(header->uuid, lttng_chan->
uuid, sizeof(lttng_chan
->uuid));
- header->stream_id = lttng_chan->id;
+ memcpy(header->uuid, lttng_chan->
priv->uuid, sizeof(lttng_chan->priv
->uuid));
+ header->stream_id = lttng_chan->
priv->
id;
header->stream_instance_id = buf->backend.cpu;
header->ctx.timestamp_begin = tsc;
header->ctx.timestamp_end = 0;
header->stream_instance_id = buf->backend.cpu;
header->ctx.timestamp_begin = tsc;
header->ctx.timestamp_end = 0;
@@
-548,9
+553,9
@@
static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf,
{
struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle,
buf->backend.chan);
{
struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle,
buf->backend.chan);
- struct lttng_
channel
*lttng_chan = channel_get_private(chan);
+ struct lttng_
ust_channel_buffer
*lttng_chan = channel_get_private(chan);
- *stream_id = lttng_chan->id;
+ *stream_id = lttng_chan->
priv->
id;
return 0;
}
return 0;
}
@@
-639,7
+644,7
@@
static const struct lttng_ust_lib_ring_buffer_config client_config = {
};
static
};
static
-struct lttng_
channel
*_channel_create(const char *name,
+struct lttng_
ust_channel_buffer
*_channel_create(const char *name,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
@@
-649,46
+654,57
@@
struct lttng_channel *_channel_create(const char *name,
const int *stream_fds, int nr_stream_fds,
int64_t blocking_timeout)
{
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_ust_shm_handle *handle;
- struct lttng_channel *lttng_chan;
- void *priv;
+ struct lttng_ust_channel_buffer *lttng_chan_buf;
+
+ lttng_chan_buf = lttng_ust_alloc_channel_buffer();
+ if (!lttng_chan_buf)
+ return NULL;
+ memcpy(lttng_chan_buf->priv->uuid, uuid, LTTNG_UST_UUID_LEN);
+ lttng_chan_buf->priv->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;
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,
handle = channel_create(&client_config, name,
-
&priv, __alignof__(struct lttng_channel
),
- sizeof(struct lttng_
channel
),
+
__alignof__(struct lttng_ust_abi_channel_config
),
+ sizeof(struct lttng_
ust_abi_channel_config
),
&chan_priv_init,
&chan_priv_init,
- buf_addr, subbuf_size, num_subbuf,
+
lttng_chan_buf,
buf_addr, subbuf_size, num_subbuf,
switch_timer_interval, read_timer_interval,
stream_fds, nr_stream_fds, blocking_timeout);
if (!handle)
switch_timer_interval, read_timer_interval,
stream_fds, nr_stream_fds, blocking_timeout);
if (!handle)
- return NULL;
- lttng_chan = priv;
- lttng_chan->handle = handle;
- lttng_chan->chan = shmp(handle, handle->chan);
- return lttng_chan;
+ goto error;
+ lttng_chan_buf->handle = handle;
+ lttng_chan_buf->chan = shmp(handle, handle->chan);
+ return lttng_chan_buf;
+
+error:
+ lttng_ust_free_channel_common(lttng_chan_buf->parent);
+ return NULL;
}
static
}
static
-void lttng_channel_destroy(struct lttng_
channel *chan
)
+void lttng_channel_destroy(struct lttng_
ust_channel_buffer *lttng_chan_buf
)
{
{
- channel_destroy(chan->chan, chan->handle, 1);
+ channel_destroy(lttng_chan_buf->chan, lttng_chan_buf->handle, 1);
+ lttng_ust_free_channel_common(lttng_chan_buf->parent);
}
static
int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
uint32_t event_id)
{
}
static
int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
uint32_t event_id)
{
- struct lttng_
channel
*lttng_chan = channel_get_private(ctx->chan);
+ struct lttng_
ust_channel_buffer
*lttng_chan = channel_get_private(ctx->chan);
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
struct lttng_client_ctx client_ctx;
int ret, cpu;
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
struct lttng_client_ctx client_ctx;
int ret, cpu;
+ client_ctx.chan_ctx = lttng_ust_rcu_dereference(lttng_chan->priv->ctx);
/* Compute internal size of context structures. */
/* Compute internal size of context structures. */
- ctx_get_struct_size(
lttng_ctx->
chan_ctx, &client_ctx.packet_context_len,
+ ctx_get_struct_size(
client_ctx.
chan_ctx, &client_ctx.packet_context_len,
APP_CTX_ENABLED);
ctx_get_struct_size(lttng_ctx->event_ctx, &client_ctx.event_context_len,
APP_CTX_ENABLED);
APP_CTX_ENABLED);
ctx_get_struct_size(lttng_ctx->event_ctx, &client_ctx.event_context_len,
APP_CTX_ENABLED);
@@
-698,7
+714,7
@@
int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
return -EPERM;
ctx->cpu = cpu;
return -EPERM;
ctx->cpu = cpu;
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->
priv->
header_type) {
case 1: /* compact */
if (event_id > 30)
ctx->rflags |= LTTNG_RFLAG_EXTENDED;
case 1: /* compact */
if (event_id > 30)
ctx->rflags |= LTTNG_RFLAG_EXTENDED;
@@
-719,7
+735,7
@@
int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx,
ret = -EPERM;
goto put;
}
ret = -EPERM;
goto put;
}
- lttng_write_event_header(&client_config, ctx, event_id);
+ lttng_write_event_header(&client_config, ctx,
&client_ctx,
event_id);
return 0;
put:
lib_ring_buffer_put_cpu(&client_config);
return 0;
put:
lib_ring_buffer_put_cpu(&client_config);
This page took
0.026667 seconds
and
4
git commands to generate.