Recent changes (master)
The following changes since commit 1aa39b0ce447f228460e6d0af601fee88fd5f4b4:
rate: ensure IO issue restarts right after sleep (2017-12-07 09:06:04 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to e80d780108fd33350f7c4a3032a8d2d06d7b102f:
fio: kill td->nr_normal_files (2017-12-08 12:50:28 -0700)
----------------------------------------------------------------
Jens Axboe (3):
rate: fix bad math
Remove old emails
fio: kill td->nr_normal_files
backend.c | 11 +++++++++-- filesetup.c | 3 --- fio.1 | 3 +-- fio.h | 1 - init.c | 4 +--- tools/fio_generate_plots.1 | 3 +-- 6 files changed, 12 insertions(+), 13 deletions(-)
---
Diff of recent changes:
backend.c +9 -2
@@ -898,8 +898,15 @@ static void handle_thinktime(struct thread_data *td, enum fio_ddir ddir)* start issuing immediately after the sleep. */ if (total && td->rate_bps[ddir] && td->o.rate_ign_think) { - td->rate_io_issue_bytes[ddir] += (td->rate_bps[ddir] *1000000 ) / total; - td->rate_io_issue_bytes[ddir] -= td->o.min_bs[ddir]; +uint64_t missed = (td->rate_bps[ddir] * total) /1000000ULL ; +uint64_t over; + +if (total >=1000000 ) + over = td->o.min_bs[ddir]; +else + over = (td->o.min_bs[ddir] * total) /1000000ULL ; + + td->rate_io_issue_bytes[ddir] += (missed - over); } }
filesetup.c +0 -3
@@ -1628,8 +1628,6 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc) } td->files_index++; -if (f->filetype ==FIO_TYPE_FILE ) - td->nr_normal_files++;if (td->o.numjobs >1 )set_already_allocated (file_name);
@@ -1855,7 +1853,6 @@ void free_release_files(struct thread_data *td) td->o.nr_files =0 ; td->o.open_files =0 ; td->files_index =0 ; - td->nr_normal_files =0 ; }void fio_file_reset (struct thread_data *td,struct fio_file *f)
fio.1 +1 -2
@@ -3559,8 +3559,7 @@ containing two hostnames `h1' and `h2' with IP addresses 192.168.10.120 and .RE .SH AUTHORS .B fio -was written by Jens Axboe <[email protected]>, -now Jens Axboe <[email protected]>. +was written by Jens Axboe <[email protected]>. .br This man page was written by Aaron Carroll <[email protected]> based on documentation by Jens Axboe.
fio.h +0 -1
@@ -208,7 +208,6 @@ struct thread_data {unsigned int files_index;unsigned int nr_open_files;unsigned int nr_done_files; -unsigned int nr_normal_files;union {unsigned int next_file;struct frand_state next_file_state;
init.c +1 -3
@@ -2142,9 +2142,7 @@ static void usage(const char *name)printf (" --trigger=cmd\t\tSet this command as local trigger\n" );printf (" --trigger-remote=cmd\tSet this command as remote trigger\n" );printf (" --aux-path=path\tUse this path for fio state generated files\n" ); -printf ("\nFio was written by Jens Axboe <[email protected]>" ); -printf ("\n Jens Axboe <[email protected]>" ); -printf ("\n Jens Axboe <[email protected]>\n" ); +printf ("\nFio was written by Jens Axboe <[email protected]>\n" ); }#ifdef FIO_INC_DEBUG
tools/fio_generate_plots.1 +1 -2
@@ -38,8 +38,7 @@ generated in the current directory. The script takes the title of the plot as only argument. It does not offer any additional options. .SH AUTHOR -fio_generate_plots was written by Jens Axboe <[email protected]>, -now Jens Axboe <[email protected]>. +fio_generate_plots was written by Jens Axboe <[email protected]> .PP This manual page was written by Martin Steigerwald <[email protected]>, for the Debian project (but may be used by others).