projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumerd: uninitialized written_bytes on no-data sleep
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.c
diff --git
a/src/common/consumer/consumer.c
b/src/common/consumer/consumer.c
index 50951fd28db4f645e9ec1c75e6984193a7416d10..99514280a7fd58932bc73b425a3fefdd76e2bced 100644
(file)
--- a/
src/common/consumer/consumer.c
+++ b/
src/common/consumer/consumer.c
@@
-3314,7
+3314,7
@@
ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
struct lttng_consumer_local_data *ctx,
bool locked_by_caller)
{
struct lttng_consumer_local_data *ctx,
bool locked_by_caller)
{
- ssize_t ret, written_bytes;
+ ssize_t ret, written_bytes
= 0
;
int rotation_ret;
struct stream_subbuffer subbuffer = {};
int rotation_ret;
struct stream_subbuffer subbuffer = {};
@@
-3347,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;
}
@@
-3412,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.02367 seconds
and
4
git commands to generate.