projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep read-only copies of fields from the channel to the stream
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index 185d42320731d026e26a167a3809a731ce597b05..539d80b0b4a32223054a08be4116fda25f7986eb 100644
(file)
--- a/
src/common/kernel-consumer/kernel-consumer.c
+++ b/
src/common/kernel-consumer/kernel-consumer.c
@@
-60,7
+60,11
@@
int lttng_kconsumer_take_snapshot(struct lttng_consumer_stream *stream)
int infd = stream->wait_fd;
ret = kernctl_snapshot(infd);
int infd = stream->wait_fd;
ret = kernctl_snapshot(infd);
- if (ret != 0) {
+ /*
+ * -EAGAIN is not an error, it just means that there is no data to
+ * be read.
+ */
+ if (ret != 0 && ret != -EAGAIN) {
PERROR("Getting sub-buffer snapshot.");
}
PERROR("Getting sub-buffer snapshot.");
}
@@
-654,6
+658,8
@@
int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
new_stream->chan = channel;
new_stream->wait_fd = fd;
new_stream->chan = channel;
new_stream->wait_fd = fd;
+ consumer_stream_update_channel_attributes(new_stream,
+ channel);
switch (channel->output) {
case CONSUMER_CHANNEL_SPLICE:
new_stream->output = LTTNG_EVENT_SPLICE;
switch (channel->output) {
case CONSUMER_CHANNEL_SPLICE:
new_stream->output = LTTNG_EVENT_SPLICE;
This page took
0.0247 seconds
and
4
git commands to generate.