X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=cbd99e7ec3ab08146142706383085b2933e314ba;hp=52b15867b968afdcd16848235093d37eb3bd5af8;hb=e66d26f5110d65c1f9549904a33986797a3759a4;hpb=f5ba75b4f0c0b44092c76bc931b25b24a2e62718 diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c index 52b15867b..cbd99e7ec 100644 --- a/src/common/consumer/consumer.c +++ b/src/common/consumer/consumer.c @@ -1685,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); - DBG("Consumer mmap write() ret %zd (len %lu)", ret, write_len); + DBG("Consumer mmap write() ret %zd (len %zu)", ret, write_len); if (ret < 0 || ((size_t) ret != write_len)) { /* * Report error to caller if nothing was written else at least send the @@ -3347,6 +3347,7 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream, if (ret == -ENODATA) { /* Not an error. */ ret = 0; + goto sleep_stream; } goto end; } @@ -3412,6 +3413,7 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream, goto end; } +stream_sleep: if (stream->read_subbuffer_ops.on_sleep) { stream->read_subbuffer_ops.on_sleep(stream, ctx); }