t/io_uring: fixes in output
PATCH 1/2 t/io_uring: fixes in output
Provide description of available options in usage command and fix alignment so they look pretty.
Also remove debug output.
--- t/io_uring.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
t/io_uring.c +10 -7
@@ -539,12 +539,16 @@ static void file_depths(char *buf)static void usage (char *argv) {printf ("%s [options] -- [filenames]\n" -" -d <int> : IO Depth, default %d\n" -" -s <int> : Batch submit, default %d\n" -" -c <int> : Batch complete, default %d\n" -" -b <int> : Block size, default %d\n" -" -p <bool> : Polled IO, default %d\n" , - argv,DEPTH ,BATCH_SUBMIT ,BATCH_COMPLETE ,BS , polled); +" -d <int> : IO Depth, default %d\n" +" -s <int> : Batch submit, default %d\n" +" -c <int> : Batch complete, default %d\n" +" -b <int> : Block size, default %d\n" +" -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" , + argv,DEPTH ,BATCH_SUBMIT ,BATCH_COMPLETE ,BS , polled, + fixedbufs, register_files, nthreads);exit (0 ); }
@@ -609,7 +613,6 @@ int main(int argc, char *argv[]) j =0 ; i = optind; -printf ("i %d, argc %d\n" , i, argc);while (!do_nop && i < argc) {struct file *f;
Signature · 1 line
1.8.3.1
PATCH 2/2 t/io_uring: allow flexible IO threads assignment
This patch allows to flexibly assign IO threads to fileset. When you specify:
t/io_uring -n 5 /dev/dev1 dev/dev2
First file/device will get 3 IO threads and second file/device remaining 2 IO threads. When there is more files then IO threads, IO thread may get assigned multiple files/devices.
--- t/io_uring.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-)
t/io_uring.c +34 -17
@@ -556,7 +556,8 @@ int main(int argc, char *argv[]) {struct submitter *s;unsigned long done, calls, reap; -int err, i, j, flags, fd, opt; +int err, i, j, flags, fd, opt, threads_per_f, threads_rem =0 , nfiles; +struct file f;char *fdepths;void *ret;
@@ -613,37 +614,53 @@ int main(int argc, char *argv[]) j =0 ; i = optind; + nfiles = argc - i; + 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) { -struct file *f; +int k, limit; + +memset (&f,0 ,sizeof (f)); - s =get_submitter (j); -if (s->nr_files ==MAX_FDS ) { -printf ("Max number of files (%d) reached\n" ,MAX_FDS ); -break ; - } fd =open (argv[i], flags);if (fd <0 ) {perror ("open" );return 1 ; } - - f = &s->files[s->nr_files]; - f->real_fd = fd; -if (get_file_size (f)) { + f.real_fd = fd; +if (get_file_size (&f)) {printf ("failed getting size of device/file\n" );return 1 ; } -if (f->max_blocks <=1 ) { +if (f.max_blocks <=1 ) {printf ("Zero file/device size?\n" );return 1 ; } - f->max_blocks--; + f.max_blocks--; + + limit = threads_per_f; + limit += threads_rem >0 ?1 :0 ; +for (k =0 ; k < limit; k++) { + s =get_submitter ((j + k) % nthreads); -printf ("Added file %s (submitter %d)\n" , argv[i], s->index); - s->nr_files++; +if (s->nr_files ==MAX_FDS ) { +printf ("Max number of files (%d) reached\n" ,MAX_FDS ); +break ; + } + +memcpy (&s->files[s->nr_files], &f,sizeof (f)); + +printf ("Added file %s (submitter %d)\n" , argv[i], s->index); + s->nr_files++; + } + threads_rem--; i++; -if (++j >= nthreads) - j =0 ; + j += limit; }if (fixedbufs) {
Signature · 1 line
1.8.3.1
Re: [PATCH 2/2] t/io_uring: allow flexible IO threads assignment
Quoted 29 lines · Andrzej Jakowski
This patch allows to flexibly assign IO threads to fileset. When you specify:
t/io_uring -n 5
/dev/dev1dev/dev2First file/device will get 3 IO threads and second file/device remaining 2 IO threads. When there is more files then IO threads, IO thread may get assigned multiple files/devices.
Signed-off-by Andrzej Jakowski <[email protected]>--- t/io_uring.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-)t/io_uring.c +2
-1@@ -556,7 +556,8 @@ int main(int argc, char *argv[]) {struct submitter *s;unsigned long done, calls, reap; -int err, i, j, flags, fd, opt; +int err, i, j, flags, fd, opt, threads_per_f, threads_rem =0 , nfiles; +struct file f;char *fdepths;void *ret;
t/io_uring.c int main(int argc, char *argv[]) · line 618
Quoted 5 lines
t/io_uring.c +2
-0@@ -613,37 +614,53 @@ int main(int argc, char *argv[]) j =0 ; i = optind; + nfiles = argc - i; + threads_per_f = nthreads / nfiles;
Can nfiles be zero?
Signature · 1 line
Jens Axboe
Jens Axboe
AppliedQuoted 4 lines · Andrzej Jakowski
Provide description of available options in usage command and fix alignment so they look pretty.
Also remove debug output.
Applied, thanks.
Signature · 1 line
Jens Axboe