projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer.c: wrong order of parameter in `DBG()` statement
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.c
diff --git
a/src/common/consumer/consumer.c
b/src/common/consumer/consumer.c
index 5c211339d42bd2017a8888b590ff5b3941cbbadf..311c64020327cdcfdb1f55a925c7b2cc90b60729 100644
(file)
--- a/
src/common/consumer/consumer.c
+++ b/
src/common/consumer/consumer.c
@@
-1583,7
+1583,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)
@@
-1686,7
+1685,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
@@
-3315,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 = {};
@@
-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;
}
@@
-3376,8
+3376,8
@@
ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
* error.
*/
DBG("Failed to write to tracefile (written_bytes: %zd != padded subbuffer size: %lu, subbuffer size: %lu)",
* error.
*/
DBG("Failed to write to tracefile (written_bytes: %zd != padded subbuffer size: %lu, subbuffer size: %lu)",
- written_bytes, subbuffer.info.data.subbuf_size,
- subbuffer.info.data.
padded_
subbuf_size);
+ written_bytes, subbuffer.info.data.
padded_
subbuf_size,
+ subbuffer.info.data.subbuf_size);
}
ret = stream->read_subbuffer_ops.put_next_subbuffer(stream, &subbuffer);
}
ret = stream->read_subbuffer_ops.put_next_subbuffer(stream, &subbuffer);
@@
-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.024034 seconds
and
4
git commands to generate.