Recent changes (master)
The following changes since commit 25425cb4a5531b1b3f26eba4e49866d944e0f1fb:
Merge branch 'ft' of https://github.com/ErwanAliasr1/fio (2021-09-08 15:40:47 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to d5c3be105af97c71bc2095ffd19343e4217abcd7:
zbd: remove dead zone retrieval call (2021-09-13 14:09:01 -0600)
----------------------------------------------------------------
Jens Axboe (3):
t/io_uring: don't require a file for do_nop runs t/io_uring: add -N option for do_nop
zbd: remove dead zone retrieval call
t/io_uring.c | 38 +++++++++++++++++++++----------------- zbd.c | 1 - 2 files changed, 21 insertions(+), 18 deletions(-)
---
Diff of recent changes:
t/io_uring.c +21 -17
@@ -553,9 +553,10 @@ static void usage(char *argv, int status)" -p <bool> : Polled IO, default %d\n" " -B <bool> : Fixed buffers, default %d\n" " -F <bool> : Register files, default %d\n" -" -n <int> : Number of threads, default %d\n" , +" -n <int> : Number of threads, 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); + fixedbufs, register_files, nthreads, do_nop);exit (status); }
@@ -568,12 +569,10 @@ int main(int argc, char *argv[])char *fdepths;void *ret; -if (!do_nop && argc <2 ) { -printf ("%s: filename [options]\n" , argv[0 ]); -return 1 ; - } +if (!do_nop && argc <2 ) +usage (argv[0 ],1 ); -while ((opt =getopt (argc, argv,"d:s:c:b:p:B:F:n:h?" )) !=-1 ) { +while ((opt =getopt (argc, argv,"d:s:c:b:p:B:F:n:N:h?" )) !=-1 ) {switch (opt) {case 'd' : depth =atoi (optarg);
@@ -603,6 +602,9 @@ int main(int argc, char *argv[])usage (argv[0 ],1 ); }break ; +case 'N' : + do_nop = !!atoi (optarg); +break ;case 'h' :case '?' :default :
@@ -626,16 +628,18 @@ int main(int argc, char *argv[]) j =0 ; i = optind; nfiles = argc - i; -if (!nfiles) { -printf ("No files specified\n" ); -usage (argv[0 ],1 ); - } - threads_per_f = nthreads / nfiles; -/* make sure each thread gets assigned files */ -if (threads_per_f ==0 ) { - threads_per_f =1 ; - }else { - threads_rem = nthreads - threads_per_f * nfiles; +if (!do_nop) { +if (!nfiles) { +printf ("No files specified\n" ); +usage (argv[0 ],1 ); + } + threads_per_f = nthreads / nfiles; +/* make sure each thread gets assigned files */ +if (threads_per_f ==0 ) { + threads_per_f =1 ; + }else { + threads_rem = nthreads - threads_per_f * nfiles; + } }while (!do_nop && i < argc) {int k, limit;
zbd.c +0 -1
@@ -1857,7 +1857,6 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u) f->file_name); goto eof; } -zbd_zone_nr (f, zb); }/* Check whether the zone reset threshold has been exceeded */ if (td->o.zrf.u.f) {