X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=t%2Fio_uring.c;h=d563638019ad87edff09d3d7944a553bd145add8;hp=cf59fe37dee770285e0975d0949cc63e45d62ba5;hb=6c5d3a1c08bda1bbf22187c7b80573400e1c1053;hpb=22fd35012ceab835ccacab4e7eaf3a34c55cb8a5

diff --git a/t/io_uring.c b/t/io_uring.c
index cf59fe37..d5636380 100644
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -617,6 +617,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (batch_complete > depth)
+		batch_complete = depth;
+	if (batch_submit > depth)
+		batch_submit = depth;
+
 	submitter = calloc(nthreads, sizeof(*submitter) +
 				depth * sizeof(struct iovec));
 	for (j = 0; j < nthreads; j++) {
@@ -727,7 +732,7 @@ int main(int argc, char *argv[])
 		unsigned long this_reap = 0;
 		unsigned long this_call = 0;
 		unsigned long rpc = 0, ipc = 0;
-		unsigned long iops;
+		unsigned long iops, bw;
 
 		sleep(1);
 		for (j = 0; j < nthreads; j++) {
@@ -742,8 +747,14 @@ int main(int argc, char *argv[])
 			rpc = ipc = -1;
 		file_depths(fdepths);
 		iops = this_done - done;
-		printf("IOPS=%lu, BW=%luMiB/s, IOS/call=%ld/%ld, inflight=(%s)\n",
-				iops, iops * (1048576 / bs), rpc, ipc, fdepths);
+		if (bs > 1048576)
+			bw = iops * (bs / 1048576);
+		else
+			bw = iops / (1048576 / bs);
+		printf("IOPS=%lu, ", iops);
+		if (!do_nop)
+			printf("BW=%luMiB/s, ", bw);
+		printf("IOS/call=%ld/%ld, inflight=(%s)\n", rpc, ipc, fdepths);
 		done = this_done;
 		calls = this_call;
 		reap = this_reap;