projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring: syscalls: move lttng_syscalls_create_matching_event_notifiers into regis...
[lttng-modules.git]
/
src
/
lttng-ring-buffer-metadata-client.h
diff --git
a/src/lttng-ring-buffer-metadata-client.h
b/src/lttng-ring-buffer-metadata-client.h
index 1558d616ce32444bc324ad1b9803add750b096c1..763ebaf1274592a3dd5c665491ad81f59fb31c75 100644
(file)
--- a/
src/lttng-ring-buffer-metadata-client.h
+++ b/
src/lttng-ring-buffer-metadata-client.h
@@
-34,7
+34,7
@@
struct metadata_record_header {
uint8_t header_end[0]; /* End of header */
};
uint8_t header_end[0]; /* End of header */
};
-static const struct l
ib
_ring_buffer_config client_config;
+static const struct l
ttng_kernel
_ring_buffer_config client_config;
static inline
u64 lib_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
static inline
u64 lib_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
@@
-43,7
+43,7
@@
u64 lib_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel *chan)
}
static inline
}
static inline
-size_t record_header_size(const struct l
ib
_ring_buffer_config *config,
+size_t record_header_size(const struct l
ttng_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_kernel_ring_buffer_channel *chan, size_t offset,
size_t *pre_header_padding,
struct lttng_kernel_ring_buffer_ctx *ctx,
@@
-60,7
+60,7
@@
static u64 client_ring_buffer_clock_read(struct lttng_kernel_ring_buffer_channel
}
static
}
static
-size_t client_record_header_size(const struct l
ib
_ring_buffer_config *config,
+size_t client_record_header_size(const struct l
ttng_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_kernel_ring_buffer_channel *chan, size_t offset,
size_t *pre_header_padding,
struct lttng_kernel_ring_buffer_ctx *ctx,
@@
-81,7
+81,7
@@
static size_t client_packet_header_size(void)
return offsetof(struct metadata_packet_header, header_end);
}
return offsetof(struct metadata_packet_header, header_end);
}
-static void client_buffer_begin(struct l
ib
_ring_buffer *buf, u64 tsc,
+static void client_buffer_begin(struct l
ttng_kernel
_ring_buffer *buf, u64 tsc,
unsigned int subbuf_idx)
{
struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
unsigned int subbuf_idx)
{
struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
@@
-109,7
+109,7
@@
static void client_buffer_begin(struct 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.
*/
* 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 l
ib
_ring_buffer *buf, u64 tsc,
+static void client_buffer_end(struct l
ttng_kernel
_ring_buffer *buf, u64 tsc,
unsigned int subbuf_idx, unsigned long data_size)
{
struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
unsigned int subbuf_idx, unsigned long data_size)
{
struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
@@
-131,80
+131,80
@@
static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
WARN_ON_ONCE(records_lost != 0);
}
WARN_ON_ONCE(records_lost != 0);
}
-static int client_buffer_create(struct l
ib
_ring_buffer *buf, void *priv,
+static int client_buffer_create(struct l
ttng_kernel
_ring_buffer *buf, void *priv,
int cpu, const char *name)
{
return 0;
}
int cpu, const char *name)
{
return 0;
}
-static void client_buffer_finalize(struct l
ib
_ring_buffer *buf, void *priv, int cpu)
+static void client_buffer_finalize(struct l
ttng_kernel
_ring_buffer *buf, void *priv, int cpu)
{
}
{
}
-static int client_timestamp_begin(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *buf, uint64_t *timestamp_begin)
+static int client_timestamp_begin(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *buf, uint64_t *timestamp_begin)
{
return -ENOSYS;
}
{
return -ENOSYS;
}
-static int client_timestamp_end(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_timestamp_end(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *timestamp_end)
{
return -ENOSYS;
}
uint64_t *timestamp_end)
{
return -ENOSYS;
}
-static int client_events_discarded(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_events_discarded(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *events_discarded)
{
return -ENOSYS;
}
uint64_t *events_discarded)
{
return -ENOSYS;
}
-static int client_current_timestamp(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_current_timestamp(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *ts)
{
return -ENOSYS;
}
uint64_t *ts)
{
return -ENOSYS;
}
-static int client_content_size(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_content_size(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *content_size)
{
return -ENOSYS;
}
uint64_t *content_size)
{
return -ENOSYS;
}
-static int client_packet_size(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_packet_size(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *packet_size)
{
return -ENOSYS;
}
uint64_t *packet_size)
{
return -ENOSYS;
}
-static int client_stream_id(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_stream_id(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *stream_id)
{
return -ENOSYS;
}
uint64_t *stream_id)
{
return -ENOSYS;
}
-static int client_sequence_number(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+static int client_sequence_number(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *seq)
{
return -ENOSYS;
}
static
uint64_t *seq)
{
return -ENOSYS;
}
static
-int client_instance_id(const struct l
ib
_ring_buffer_config *config,
- struct l
ib
_ring_buffer *bufb,
+int client_instance_id(const struct l
ttng_kernel
_ring_buffer_config *config,
+ struct l
ttng_kernel
_ring_buffer *bufb,
uint64_t *id)
{
return -ENOSYS;
}
uint64_t *id)
{
return -ENOSYS;
}
-static const struct l
ib
_ring_buffer_config client_config = {
+static const struct l
ttng_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,
.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,
@@
-270,9
+270,9
@@
error:
}
static
}
static
-struct l
ib
_ring_buffer *lttng_buffer_read_open(struct lttng_kernel_ring_buffer_channel *chan)
+struct l
ttng_kernel
_ring_buffer *lttng_buffer_read_open(struct lttng_kernel_ring_buffer_channel *chan)
{
{
- struct l
ib
_ring_buffer *buf;
+ struct l
ttng_kernel
_ring_buffer *buf;
buf = channel_get_ring_buffer(&client_config, chan, 0);
if (!lib_ring_buffer_open_read(buf))
buf = channel_get_ring_buffer(&client_config, chan, 0);
if (!lib_ring_buffer_open_read(buf))
@@
-283,7
+283,7
@@
struct lib_ring_buffer *lttng_buffer_read_open(struct lttng_kernel_ring_buffer_c
static
int lttng_buffer_has_read_closed_stream(struct lttng_kernel_ring_buffer_channel *chan)
{
static
int lttng_buffer_has_read_closed_stream(struct lttng_kernel_ring_buffer_channel *chan)
{
- struct l
ib
_ring_buffer *buf;
+ struct l
ttng_kernel
_ring_buffer *buf;
int cpu;
for_each_channel_cpu(cpu, chan) {
int cpu;
for_each_channel_cpu(cpu, chan) {
@@
-295,7
+295,7
@@
int lttng_buffer_has_read_closed_stream(struct lttng_kernel_ring_buffer_channel
}
static
}
static
-void lttng_buffer_read_close(struct l
ib
_ring_buffer *buf)
+void lttng_buffer_read_close(struct l
ttng_kernel
_ring_buffer *buf)
{
lib_ring_buffer_release_read(buf);
}
{
lib_ring_buffer_release_read(buf);
}
@@
-326,15
+326,17
@@
void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
static
void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
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,
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);
}
lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
}
@@
-352,11
+354,18
@@
void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *sr
lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
}
lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
}
+static
+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
size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
{
unsigned long o_begin;
static
size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
{
unsigned long o_begin;
- struct l
ib
_ring_buffer *buf;
+ struct l
ttng_kernel
_ring_buffer *buf;
buf = chan->backend.buf; /* Only for global buffer ! */
o_begin = v_read(&client_config, &buf->offset);
buf = chan->backend.buf; /* Only for global buffer ! */
o_begin = v_read(&client_config, &buf->offset);
@@
-371,7
+380,7
@@
size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
static
wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct lttng_kernel_ring_buffer_channel *chan, int cpu)
{
static
wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct lttng_kernel_ring_buffer_channel *chan, int cpu)
{
- struct l
ib
_ring_buffer *buf = channel_get_ring_buffer(&client_config,
+ struct l
ttng_kernel
_ring_buffer *buf = channel_get_ring_buffer(&client_config,
chan, cpu);
return &buf->write_wait;
}
chan, cpu);
return &buf->write_wait;
}
@@
-427,6
+436,7
@@
static struct lttng_transport lttng_relay_transport = {
.event_memset = lttng_event_memset,
.event_write = lttng_event_write,
.event_strcpy = lttng_event_strcpy,
.event_memset = lttng_event_memset,
.event_write = lttng_event_write,
.event_strcpy = lttng_event_strcpy,
+ .event_pstrcpy_pad = lttng_event_pstrcpy_pad,
},
};
},
};
This page took
0.027154 seconds
and
4
git commands to generate.