t/io_uring: don't print BW numbers for do_nop

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index aed6fdbd0627a2b69dc53238b40e301abd66466a..d563638019ad87edff09d3d7944a553bd145add8 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -554,9 +554,10 @@ static void usage(char *argv, int status)
                " -B <bool> : Fixed buffers, default %d\n"
                " -F <bool> : Register files, default %d\n"
                " -n <int>  : Number of threads, default %d\n"
+               " -O <bool> : Use O_DIRECT, default %d\n"
                " -N <bool> : Perform just no-op requests, default %d\n",
                argv, DEPTH, BATCH_SUBMIT, BATCH_COMPLETE, BS, polled,
-               fixedbufs, register_files, nthreads, do_nop);
+               fixedbufs, register_files, nthreads, !buffered, do_nop);
        exit(status);
 }
 
@@ -572,7 +573,7 @@ int main(int argc, char *argv[])
        if (!do_nop && argc < 2)
                usage(argv[0], 1);
 
-       while ((opt = getopt(argc, argv, "d:s:c:b:p:B:F:n:N:h?")) != -1) {
+       while ((opt = getopt(argc, argv, "d:s:c:b:p:B:F:n:N:O:h?")) != -1) {
                switch (opt) {
                case 'd':
                        depth = atoi(optarg);
@@ -605,6 +606,9 @@ int main(int argc, char *argv[])
                case 'N':
                        do_nop = !!atoi(optarg);
                        break;
+               case 'O':
+                       buffered = !atoi(optarg);
+                       break;
                case 'h':
                case '?':
                default:
@@ -613,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++) {
@@ -723,6 +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, bw;
 
                sleep(1);
                for (j = 0; j < nthreads; j++) {
@@ -736,8 +746,15 @@ int main(int argc, char *argv[])
                } else
                        rpc = ipc = -1;
                file_depths(fdepths);
-               printf("IOPS=%lu, IOS/call=%ld/%ld, inflight=(%s)\n",
-                               this_done - done, rpc, ipc, fdepths);
+               iops = this_done - done;
+               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;