projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consumerd: pass channel instance to stream creation function
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index 9055d0cf8baa82ef9a88257a3b002aa5823c1e5d..b46a505021203a017832cec88826244f02895643 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-147,7
+147,9
@@
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
assert(channel);
assert(ctx);
assert(channel);
assert(ctx);
- stream = consumer_allocate_stream(channel->key,
+ stream = consumer_allocate_stream(
+ channel,
+ channel->key,
key,
channel->name,
channel->relayd_id,
key,
channel->name,
channel->relayd_id,
@@
-176,7
+178,6
@@
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
}
consumer_stream_update_channel_attributes(stream, channel);
}
consumer_stream_update_channel_attributes(stream, channel);
- stream->chan = channel;
error:
if (_alloc_ret) {
error:
if (_alloc_ret) {
@@
-1211,6
+1212,7
@@
static int snapshot_channel(struct lttng_consumer_channel *channel,
ssize_t read_len;
unsigned long len, padded_len;
const char *subbuf_addr;
ssize_t read_len;
unsigned long len, padded_len;
const char *subbuf_addr;
+ struct lttng_buffer_view subbuf_view;
health_code_update();
health_code_update();
@@
-1245,9
+1247,11
@@
static int snapshot_channel(struct lttng_consumer_channel *channel,
goto error_put_subbuf;
}
goto error_put_subbuf;
}
+ subbuf_view = lttng_buffer_view_init(
+ subbuf_addr, 0, padded_len);
read_len = lttng_consumer_on_read_subbuffer_mmap(ctx,
read_len = lttng_consumer_on_read_subbuffer_mmap(ctx,
- stream,
subbuf_addr,
len,
-
padded_len - len,
NULL);
+ stream,
&subbuf_view, padded_len -
len,
+ NULL);
if (use_relayd) {
if (read_len != len) {
ret = -EPERM;
if (use_relayd) {
if (read_len != len) {
ret = -EPERM;
@@
-2808,6
+2812,7
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
struct ustctl_consumer_stream *ustream;
struct ctf_packet_index index;
const char *subbuf_addr;
struct ustctl_consumer_stream *ustream;
struct ctf_packet_index index;
const char *subbuf_addr;
+ struct lttng_buffer_view subbuf_view;
assert(stream);
assert(stream->ustream);
assert(stream);
assert(stream->ustream);
@@
-2923,9
+2928,11
@@
retry:
goto error_put_subbuf;
}
goto error_put_subbuf;
}
+ subbuf_view = lttng_buffer_view_init(subbuf_addr, 0, len);
+
/* write the subbuffer to the tracefile */
ret = lttng_consumer_on_read_subbuffer_mmap(
/* write the subbuffer to the tracefile */
ret = lttng_consumer_on_read_subbuffer_mmap(
- ctx, stream,
subbuf_addr, subbuf_size
, padding, &index);
+ ctx, stream,
&subbuf_view
, padding, &index);
/*
* The mmap operation should write subbuf_size amount of data when
* network streaming or the full padding (len) size when we are _not_
/*
* The mmap operation should write subbuf_size amount of data when
* network streaming or the full padding (len) size when we are _not_
This page took
0.0241 seconds
and
4
git commands to generate.