projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.6.5
[lttng-modules.git]
/
lttng-ring-buffer-metadata-client.h
diff --git
a/lttng-ring-buffer-metadata-client.h
b/lttng-ring-buffer-metadata-client.h
index 5c8a1df9e1828e76f432c211697d36024b523d80..4945ce463ed565a977edb738120c3ae64ab5101f 100644
(file)
--- a/
lttng-ring-buffer-metadata-client.h
+++ b/
lttng-ring-buffer-metadata-client.h
@@
-55,7
+55,7
@@
u64 lib_ring_buffer_clock_read(struct channel *chan)
}
static inline
}
static inline
-
unsigned char
record_header_size(const struct lib_ring_buffer_config *config,
+
size_t
record_header_size(const struct lib_ring_buffer_config *config,
struct channel *chan, size_t offset,
size_t *pre_header_padding,
struct lib_ring_buffer_ctx *ctx)
struct channel *chan, size_t offset,
size_t *pre_header_padding,
struct lib_ring_buffer_ctx *ctx)
@@
-99,11
+99,12
@@
static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
(struct metadata_packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
subbuf_idx * chan->backend.subbuf_size);
(struct metadata_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_session *session = lttng_chan->session
;
+ struct lttng_
metadata_cache *metadata_cache =
+
channel_get_private(chan)
;
header->magic = TSDL_MAGIC_NUMBER;
header->magic = TSDL_MAGIC_NUMBER;
- memcpy(header->uuid, session->uuid.b, sizeof(session->uuid));
+ memcpy(header->uuid, metadata_cache->uuid.b,
+ sizeof(metadata_cache->uuid));
header->checksum = 0; /* 0 if unused */
header->content_size = 0xFFFFFFFF; /* in bits, for debugging */
header->packet_size = 0xFFFFFFFF; /* in bits, for debugging */
header->checksum = 0; /* 0 if unused */
header->content_size = 0xFFFFFFFF; /* in bits, for debugging */
header->packet_size = 0xFFFFFFFF; /* in bits, for debugging */
@@
-239,7
+240,8
@@
struct channel *_channel_create(const char *name,
{
struct channel *chan;
{
struct channel *chan;
- chan = channel_create(&client_config, name, lttng_chan, buf_addr,
+ chan = channel_create(&client_config, name,
+ lttng_chan->session->metadata_cache, buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
read_timer_interval);
if (chan) {
subbuf_size, num_subbuf, switch_timer_interval,
read_timer_interval);
if (chan) {
@@
-325,6
+327,13
@@
void lttng_event_memset(struct lib_ring_buffer_ctx *ctx,
lib_ring_buffer_memset(&client_config, ctx, c, len);
}
lib_ring_buffer_memset(&client_config, ctx, c, len);
}
+static
+void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src,
+ size_t len)
+{
+ lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
+}
+
static
size_t lttng_packet_avail_size(struct channel *chan)
static
size_t lttng_packet_avail_size(struct channel *chan)
@@
-383,6
+392,7
@@
static struct lttng_transport lttng_relay_transport = {
.event_write_from_user = lttng_event_write_from_user,
.event_memset = lttng_event_memset,
.event_write = lttng_event_write,
.event_write_from_user = lttng_event_write_from_user,
.event_memset = lttng_event_memset,
.event_write = lttng_event_write,
+ .event_strcpy = lttng_event_strcpy,
.packet_avail_size = lttng_packet_avail_size,
.get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue,
.get_hp_wait_queue = lttng_get_hp_wait_queue,
.packet_avail_size = lttng_packet_avail_size,
.get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue,
.get_hp_wait_queue = lttng_get_hp_wait_queue,
This page took
0.024195 seconds
and
4
git commands to generate.