The following changes since commit 2d8c2709dc067aabdeab8bc1eea1992d9d802375: io_u: fix bad style (2023-04-04 09:49:19 -0600) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to 2bb86015831c3ef3f8a077f417ad79ed6998ed48: Merge branch 'libaio-hang' of https://github.com/lrumancik/fio (2023-04-07 16:42:07 -0600) ---------------------------------------------------------------- Jens Axboe (1): Merge branch 'libaio-hang' of https://github.com/lrumancik/fio Leah Rumancik (1): engines/libaio: fix io_getevents min/max events arguments engines/libaio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- Diff of recent changes: diff --git a/engines/libaio.c b/engines/libaio.c index 33b8c12f..1b82c90b 100644 --- a/engines/libaio.c +++ b/engines/libaio.c @@ -288,14 +288,16 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min, && actual_min == 0 && ((struct aio_ring *)(ld->aio_ctx))->magic == AIO_RING_MAGIC) { - r = user_io_getevents(ld->aio_ctx, max, + r = user_io_getevents(ld->aio_ctx, max - events, ld->aio_events + events); } else { r = io_getevents(ld->aio_ctx, actual_min, - max, ld->aio_events + events, lt); + max - events, ld->aio_events + events, lt); } - if (r > 0) + if (r > 0) { events += r; + actual_min = actual_min > events ? actual_min - events : 0; + } else if ((min && r == 0) || r == -EAGAIN) { fio_libaio_commit(td); if (actual_min)
