size_t event_context_len;
};
-static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan)
+static inline notrace u64 lib_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
{
return trace_clock_read64();
}
static inline
void ctx_get_struct_size(struct lttng_kernel_ctx *ctx, size_t *ctx_len,
- struct lttng_channel *chan, struct lttng_kernel_ring_buffer_ctx *bufctx)
+ struct lttng_kernel_channel_buffer *lttng_chan,
+ struct lttng_kernel_ring_buffer_ctx *bufctx)
{
int i;
size_t offset = 0;
static inline
void ctx_record(struct lttng_kernel_ring_buffer_ctx *bufctx,
- struct lttng_channel *chan,
+ struct lttng_kernel_channel_buffer *lttng_chan,
struct lttng_kernel_ctx *ctx)
{
int i;
lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
for (i = 0; i < ctx->nr_fields; i++)
ctx->fields[i].record(ctx->fields[i].priv, bufctx->probe_ctx,
- bufctx, chan);
+ bufctx, lttng_chan);
}
/*
* contains.
*/
static __inline__
-size_t record_header_size(const struct lib_ring_buffer_config *config,
- struct channel *chan, size_t offset,
+size_t record_header_size(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer_channel *chan, size_t offset,
size_t *pre_header_padding,
struct lttng_kernel_ring_buffer_ctx *ctx,
struct lttng_client_ctx *client_ctx)
{
- struct lttng_channel *lttng_chan = channel_get_private(chan);
+ struct lttng_kernel_channel_buffer *lttng_chan = channel_get_private(chan);
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;
padding = 0;
WARN_ON_ONCE(1);
}
- offset += ctx_get_aligned_size(offset, lttng_chan->ctx,
+ offset += ctx_get_aligned_size(offset, lttng_chan->priv->ctx,
client_ctx->packet_context_len);
*pre_header_padding = padding;
return offset - orig_offset;
#include <ringbuffer/api.h>
static
-void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
+void lttng_write_event_header_slow(const struct lttng_kernel_ring_buffer_config *config,
struct lttng_kernel_ring_buffer_ctx *ctx,
uint32_t event_id);
* @event_id: event ID
*/
static __inline__
-void lttng_write_event_header(const struct lib_ring_buffer_config *config,
+void lttng_write_event_header(const struct lttng_kernel_ring_buffer_config *config,
struct lttng_kernel_ring_buffer_ctx *ctx,
uint32_t event_id)
{
- struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
+ struct lttng_kernel_channel_buffer *lttng_chan = channel_get_private(ctx->priv.chan);
if (unlikely(ctx->priv.rflags))
goto slow_path;
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->priv->header_type) {
case 1: /* compact */
{
uint32_t id_time = 0;
WARN_ON_ONCE(1);
}
- ctx_record(ctx, lttng_chan, lttng_chan->ctx);
+ ctx_record(ctx, lttng_chan, lttng_chan->priv->ctx);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
return;
}
static
-void lttng_write_event_header_slow(const struct lib_ring_buffer_config *config,
+void lttng_write_event_header_slow(const struct lttng_kernel_ring_buffer_config *config,
struct lttng_kernel_ring_buffer_ctx *ctx,
uint32_t event_id)
{
- struct lttng_channel *lttng_chan = channel_get_private(ctx->priv.chan);
+ struct lttng_kernel_channel_buffer *lttng_chan = channel_get_private(ctx->priv.chan);
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->priv->header_type) {
case 1: /* compact */
if (!(ctx->priv.rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) {
uint32_t id_time = 0;
default:
WARN_ON_ONCE(1);
}
- ctx_record(ctx, lttng_chan, lttng_chan->ctx);
+ ctx_record(ctx, lttng_chan, lttng_chan->priv->ctx);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
}
-static const struct lib_ring_buffer_config client_config;
+static const struct lttng_kernel_ring_buffer_config client_config;
-static u64 client_ring_buffer_clock_read(struct channel *chan)
+static u64 client_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
{
return lib_ring_buffer_clock_read(chan);
}
static
-size_t client_record_header_size(const struct lib_ring_buffer_config *config,
- struct channel *chan, size_t offset,
+size_t client_record_header_size(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer_channel *chan, size_t offset,
size_t *pre_header_padding,
struct lttng_kernel_ring_buffer_ctx *ctx,
void *client_ctx)
return offsetof(struct packet_header, ctx.header_end);
}
-static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
+static void client_buffer_begin(struct lttng_kernel_ring_buffer *buf, u64 tsc,
unsigned int subbuf_idx)
{
- struct channel *chan = buf->backend.chan;
+ struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
struct packet_header *header =
(struct packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
subbuf_idx * chan->backend.subbuf_size);
- struct lttng_channel *lttng_chan = channel_get_private(chan);
- struct lttng_kernel_session *session = lttng_chan->session;
+ struct lttng_kernel_channel_buffer *lttng_chan = channel_get_private(chan);
+ struct lttng_kernel_session *session = lttng_chan->parent.session;
header->magic = CTF_MAGIC_NUMBER;
memcpy(header->uuid, session->priv->uuid.b, sizeof(session->priv->uuid));
- header->stream_id = lttng_chan->id;
+ header->stream_id = lttng_chan->priv->id;
header->stream_instance_id = buf->backend.cpu;
header->ctx.timestamp_begin = tsc;
header->ctx.timestamp_end = 0;
* 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 lib_ring_buffer *buf, u64 tsc,
- unsigned int subbuf_idx, unsigned long data_size)
+static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc,
+ unsigned int subbuf_idx, unsigned long data_size,
+ const struct lttng_kernel_ring_buffer_ctx *ctx)
{
- struct channel *chan = buf->backend.chan;
+ struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
struct packet_header *header =
(struct packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
(uint64_t) data_size * CHAR_BIT; /* in bits */
header->ctx.packet_size =
(uint64_t) PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
- 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);
+ records_lost += lib_ring_buffer_get_records_lost_full(&client_config, ctx);
+ records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, ctx);
+ records_lost += lib_ring_buffer_get_records_lost_big(&client_config, ctx);
header->ctx.events_discarded = records_lost;
}
-static int client_buffer_create(struct lib_ring_buffer *buf, void *priv,
+static int client_buffer_create(struct lttng_kernel_ring_buffer *buf, void *priv,
int cpu, const char *name)
{
return 0;
}
-static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu)
+static void client_buffer_finalize(struct lttng_kernel_ring_buffer *buf, void *priv, int cpu)
{
}
static struct packet_header *client_packet_header(
- const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf)
+ const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf)
{
return lib_ring_buffer_read_offset_address(&buf->backend, 0);
}
-static int client_timestamp_begin(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_timestamp_begin(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *timestamp_begin)
{
struct packet_header *header = client_packet_header(config, buf);
return 0;
}
-static int client_timestamp_end(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_timestamp_end(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *timestamp_end)
{
struct packet_header *header = client_packet_header(config, buf);
return 0;
}
-static int client_events_discarded(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_events_discarded(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *events_discarded)
{
struct packet_header *header = client_packet_header(config, buf);
return 0;
}
-static int client_content_size(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_content_size(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *content_size)
{
struct packet_header *header = client_packet_header(config, buf);
return 0;
}
-static int client_packet_size(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_packet_size(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *packet_size)
{
struct packet_header *header = client_packet_header(config, buf);
return 0;
}
-static int client_stream_id(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_stream_id(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *stream_id)
{
- struct channel *chan = buf->backend.chan;
- struct lttng_channel *lttng_chan = channel_get_private(chan);
+ struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
+ struct lttng_kernel_channel_buffer *lttng_chan = channel_get_private(chan);
- *stream_id = lttng_chan->id;
+ *stream_id = lttng_chan->priv->id;
return 0;
}
-static int client_current_timestamp(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *bufb,
+static int client_current_timestamp(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *bufb,
uint64_t *ts)
{
*ts = config->cb.ring_buffer_clock_read(bufb->backend.chan);
return 0;
}
-static int client_sequence_number(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+static int client_sequence_number(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *seq)
{
struct packet_header *header = client_packet_header(config, buf);
}
static
-int client_instance_id(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer *buf,
+int client_instance_id(const struct lttng_kernel_ring_buffer_config *config,
+ struct lttng_kernel_ring_buffer *buf,
uint64_t *id)
{
*id = buf->backend.cpu;
return 0;
}
-static const struct lib_ring_buffer_config client_config = {
+static const struct lttng_kernel_ring_buffer_config client_config = {
.cb.ring_buffer_clock_read = client_ring_buffer_clock_read,
.cb.record_header_size = client_record_header_size,
.cb.subbuffer_header_size = client_packet_header_size,
}
static
-void lttng_channel_destroy(struct channel *chan)
+void lttng_channel_destroy(struct lttng_kernel_ring_buffer_channel *chan)
{
channel_destroy(chan);
}
static
-struct channel *_channel_create(const char *name,
+struct lttng_kernel_ring_buffer_channel *_channel_create(const char *name,
void *priv, void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
unsigned int read_timer_interval)
{
- struct lttng_channel *lttng_chan = priv;
- struct channel *chan;
+ struct lttng_kernel_channel_buffer *lttng_chan = priv;
+ struct lttng_kernel_ring_buffer_channel *chan;
chan = channel_create(&client_config, name, lttng_chan, buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
}
static
-struct lib_ring_buffer *lttng_buffer_read_open(struct channel *chan)
+struct lttng_kernel_ring_buffer *lttng_buffer_read_open(struct lttng_kernel_ring_buffer_channel *chan)
{
- struct lib_ring_buffer *buf;
+ struct lttng_kernel_ring_buffer *buf;
int cpu;
for_each_channel_cpu(cpu, chan) {
}
static
-int lttng_buffer_has_read_closed_stream(struct channel *chan)
+int lttng_buffer_has_read_closed_stream(struct lttng_kernel_ring_buffer_channel *chan)
{
- struct lib_ring_buffer *buf;
+ struct lttng_kernel_ring_buffer *buf;
int cpu;
for_each_channel_cpu(cpu, chan) {
}
static
-void lttng_buffer_read_close(struct lib_ring_buffer *buf)
+void lttng_buffer_read_close(struct lttng_kernel_ring_buffer *buf)
{
lib_ring_buffer_release_read(buf);
}
int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx)
{
struct lttng_kernel_event_recorder *event_recorder = ctx->client_priv;
- struct lttng_channel *lttng_chan = event_recorder->chan;
+ struct lttng_kernel_channel_buffer *lttng_chan = event_recorder->chan;
struct lttng_client_ctx client_ctx;
int ret, cpu;
uint32_t event_id;
return -EPERM;
event_id = event_recorder->priv->id;
memset(&ctx->priv, 0, sizeof(ctx->priv));
- ctx->priv.chan = lttng_chan->chan;
+ ctx->priv.chan = lttng_chan->priv->rb_chan;
ctx->priv.reserve_cpu = cpu;
/* Compute internal size of context structures. */
- ctx_get_struct_size(lttng_chan->ctx, &client_ctx.packet_context_len, lttng_chan, ctx);
+ ctx_get_struct_size(lttng_chan->priv->ctx, &client_ctx.packet_context_len, lttng_chan, ctx);
- switch (lttng_chan->header_type) {
+ switch (lttng_chan->priv->header_type) {
case 1: /* compact */
if (event_id > 30)
ctx->priv.rflags |= LTTNG_RFLAG_EXTENDED;
static
void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
- size_t len)
+ size_t len, size_t alignment)
{
+ lib_ring_buffer_align_ctx(ctx, alignment);
lib_ring_buffer_write(&client_config, ctx, src, len);
}
static
void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
- const void __user *src, size_t len)
+ const void __user *src, size_t len, size_t alignment)
{
+ lib_ring_buffer_align_ctx(ctx, alignment);
lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
}
}
static
-wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct channel *chan, int cpu)
+void lttng_event_pstrcpy_pad(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
+ size_t len)
+{
+ lib_ring_buffer_pstrcpy(&client_config, ctx, src, len, '\0');
+}
+
+static
+void lttng_event_pstrcpy_pad_from_user(struct lttng_kernel_ring_buffer_ctx *ctx, const char __user *src,
+ size_t len)
+{
+ lib_ring_buffer_pstrcpy_from_user_inatomic(&client_config, ctx, src, len, '\0');
+}
+
+static
+void lttng_channel_buffer_lost_event_too_big(struct lttng_kernel_channel_buffer *lttng_chan)
+{
+ lib_ring_buffer_lost_event_too_big(lttng_chan->priv->rb_chan);
+}
+
+static
+wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct lttng_kernel_ring_buffer_channel *chan, int cpu)
{
- struct lib_ring_buffer *buf = channel_get_ring_buffer(&client_config,
+ struct lttng_kernel_ring_buffer *buf = channel_get_ring_buffer(&client_config,
chan, cpu);
return &buf->write_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_kernel_ring_buffer_channel *chan)
{
return &chan->hp_wait;
}
static
-int lttng_is_finalized(struct channel *chan)
+int lttng_is_finalized(struct lttng_kernel_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_kernel_ring_buffer_channel *chan)
{
return lib_ring_buffer_channel_is_disabled(chan);
}
.event_memset = lttng_event_memset,
.event_strcpy = lttng_event_strcpy,
.event_strcpy_from_user = lttng_event_strcpy_from_user,
+ .event_pstrcpy_pad = lttng_event_pstrcpy_pad,
+ .event_pstrcpy_pad_from_user = lttng_event_pstrcpy_pad_from_user,
+ .lost_event_too_big = lttng_channel_buffer_lost_event_too_big,
},
};