Recent changes (master)

[Jens Axboe <axboe@xxxxxxxxx>]

The following changes since commit b1ebcbce6499fed58f87d1bcbfd50899c508d3ab:

  Merge branch 'evelu-ocp' of https://github.com/ErwanAliasr1/fio (2021-10-07 06:18:21 -0600)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to d4af2ecea2930138bbaf58fe84debef8e84761c6:

  t/io_uring: fix latency stats for depth == 1 (2021-10-09 12:56:11 -0600)

----------------------------------------------------------------
Jens Axboe (1):
      t/io_uring: fix latency stats for depth == 1

 t/io_uring.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

---

Diff of recent changes:

diff --git a/t/io_uring.c b/t/io_uring.c
index 2c9fd08c..cdd15986 100644
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -531,8 +531,8 @@ static int reap_events_uring(struct submitter *s)
 					stat_nr = 0;
 				}
 				last_idx = clock_index;
-			} else if (clock_index)
-				stat_nr++;
+			}
+			stat_nr++;
 		}
 		reaped++;
 		head++;
@@ -562,6 +562,8 @@ static int submitter_init(struct submitter *s)
 
 	if (stats) {
 		nr_batch = roundup_pow2(depth / batch_submit);
+		if (nr_batch < 2)
+			nr_batch = 2;
 		s->clock_batch = calloc(nr_batch, sizeof(unsigned long));
 		s->clock_index = 1;
 
@@ -637,8 +639,8 @@ static int reap_events_aio(struct submitter *s, struct io_event *events, int evs
 					stat_nr = 0;
 				}
 				last_idx = clock_index;
-			} else if (clock_index)
-				stat_nr++;
+			}
+			stat_nr++;
 		}
 		reaped++;
 		evs--;