projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: consumerd misnamed label
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.c
diff --git
a/src/common/consumer/consumer.c
b/src/common/consumer/consumer.c
index 86caf6841d43501521ba0a8865402809bfa2d0b8..da5d7ccfb68ffcf7f8ecbde438baccce4538ad65 100644
(file)
--- a/
src/common/consumer/consumer.c
+++ b/
src/common/consumer/consumer.c
@@
-1584,7
+1584,6
@@
end:
* Returns the number of bytes written
*/
ssize_t lttng_consumer_on_read_subbuffer_mmap(
* Returns the number of bytes written
*/
ssize_t lttng_consumer_on_read_subbuffer_mmap(
- struct lttng_consumer_local_data *ctx,
struct lttng_consumer_stream *stream,
const struct lttng_buffer_view *buffer,
unsigned long padding)
struct lttng_consumer_stream *stream,
const struct lttng_buffer_view *buffer,
unsigned long padding)
@@
-1687,7
+1686,7
@@
ssize_t lttng_consumer_on_read_subbuffer_mmap(
* receive a ret value that is bigger than len.
*/
ret = lttng_write(outfd, buffer->data, write_len);
* receive a ret value that is bigger than len.
*/
ret = lttng_write(outfd, buffer->data, write_len);
- DBG("Consumer mmap write() ret %zd (len %
l
u)", ret, write_len);
+ DBG("Consumer mmap write() ret %zd (len %
z
u)", ret, write_len);
if (ret < 0 || ((size_t) ret != write_len)) {
/*
* Report error to caller if nothing was written else at least send the
if (ret < 0 || ((size_t) ret != write_len)) {
/*
* Report error to caller if nothing was written else at least send the
@@
-3348,6
+3347,7
@@
ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
if (ret == -ENODATA) {
/* Not an error. */
ret = 0;
if (ret == -ENODATA) {
/* Not an error. */
ret = 0;
+ goto sleep_stream;
}
goto end;
}
}
goto end;
}
@@
-3413,6
+3413,7
@@
ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
goto end;
}
goto end;
}
+sleep_stream:
if (stream->read_subbuffer_ops.on_sleep) {
stream->read_subbuffer_ops.on_sleep(stream, ctx);
}
if (stream->read_subbuffer_ops.on_sleep) {
stream->read_subbuffer_ops.on_sleep(stream, ctx);
}
This page took
0.02467 seconds
and
4
git commands to generate.