Recent changes (master)
The following changes since commit a1db4528a59a99c5e2aa66091c505fb60e3a70ca:
Merge branch 'fio-docs-ci' of https://github.com/vincentkfu/fio (2022-02-11 16:29:44 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 6a16e9e9531a5f746c4e2fe43873de1db434b4fc:
diskutil: include limits.h for PATH_MAX (2022-02-15 17:17:30 -0700)
----------------------------------------------------------------
Jens Axboe (4):
Merge branch 'fix_bytesrate_eta' of https://github.com/PCPartPicker/fio
Merge branch 'rand_nr_bugfix' of https://github.com/PCPartPicker/fio
Merge branch 'check_min_rate_cleanup' of https://github.com/PCPartPicker/fio
diskutil: include limits.h for PATH_MAX
Vincent Fu (1):
ci: detect Windows installer build failures
aggieNick02 (3):
Cleanup __check_min_rate
Fix ETA display when rate and/or rate_min are specified Fix :<nr> suffix with random read/write causing 0 initial offset
.appveyor.yml | 1 + backend.c | 81 ++++++++++++++++++++--------------------------------------- diskutil.h | 2 ++ eta.c | 5 ++-- fio.h | 6 ++--- init.c | 9 ++++++- libfio.c | 4 +-- 7 files changed, 46 insertions(+), 62 deletions(-)
---
Diff of recent changes:
.appveyor.yml +1 -0
@@ -44,6 +44,7 @@ after_build: - file.exe fio.exe - make.exe test - 'cd os\windows && dobuild.cmd %ARCHITECTURE% && cd ..' + - ls.exe ./os/windows/*.msi - ps: Get-ChildItem .\os\windows\*.msi | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name -DeploymentName fio.msi } test_script:
backend.c +27 -54
119 lines not on this page · raw message
diskutil.h +2 -0
@@ -2,6 +2,8 @@#define FIO_DISKUTIL_H #define FIO_DU_NAME_SZ 64 +#include <limits.h> +#include "helper_thread.h" #include "fio_sem.h"
eta.c +3 -2
@@ -420,6 +420,7 @@ bool calc_thread_status(struct jobs_eta *je, int force)if (is_power_of_2 (td->o.kb_base)) je->is_pow2 =1 ; je->unit_base = td->o.unit_base; + je->sig_figs = td->o.sig_figs;if (td->o.bw_avg_time < bw_avg_time) bw_avg_time = td->o.bw_avg_time; if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
@@ -600,9 +601,9 @@ void display_thread_status(struct jobs_eta *je)char *tr, *mr; mr =num2str (je->m_rate[0 ] + je->m_rate[1 ] + je->m_rate[2 ], - je->sig_figs,0 , je->is_pow2,N2S_BYTEPERSEC ); + je->sig_figs,1 , je->is_pow2,N2S_BYTEPERSEC ); tr =num2str (je->t_rate[0 ] + je->t_rate[1 ] + je->t_rate[2 ], - je->sig_figs,0 , je->is_pow2,N2S_BYTEPERSEC ); + je->sig_figs,1 , je->is_pow2,N2S_BYTEPERSEC ); p +=sprintf (p,", %s-%s" , mr, tr);free (tr);
fio.h +3 -3
@@ -335,10 +335,10 @@ struct thread_data {*/ uint64_t rate_bps[DDIR_RWDIR_CNT ];uint64_t rate_next_io_time[DDIR_RWDIR_CNT ]; -unsigned long long rate_bytes[DDIR_RWDIR_CNT ]; -unsigned long rate_blocks[DDIR_RWDIR_CNT ]; +unsigned long long last_rate_check_bytes[DDIR_RWDIR_CNT ]; +unsigned long last_rate_check_blocks[DDIR_RWDIR_CNT ];unsigned long long rate_io_issue_bytes[DDIR_RWDIR_CNT ]; -struct timespec lastrate[DDIR_RWDIR_CNT ]; +struct timespec last_rate_check_time[DDIR_RWDIR_CNT ];int64_t last_usec[DDIR_RWDIR_CNT ];struct frand_state poisson_state[DDIR_RWDIR_CNT ];
init.c +8 -1
@@ -1576,7 +1576,14 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num, td->ts.sig_figs = o->sig_figs;init_thread_stat_min_vals (&td->ts); - td->ddir_seq_nr = o->ddir_seq_nr; + +/* +* td->>ddir_seq_nr needs to be initialized to 1, NOT o->ddir_seq_nr, +* so that get_next_offset gets a new random offset the first time it +* is called, instead of keeping an initial offset of 0 for the first +* nr-1 calls +*/ + td->ddir_seq_nr =1 ;if ((o->stonewall || o->new_group) && prev_group_jobs) { prev_group_jobs =0 ;
libfio.c +2 -2
@@ -87,8 +87,8 @@ static void reset_io_counters(struct thread_data *td, int all) td->this_io_bytes[ddir] =0 ; td->stat_io_blocks[ddir] =0 ; td->this_io_blocks[ddir] =0 ; - td->rate_bytes[ddir] =0 ; - td->rate_blocks[ddir] =0 ; + td->last_rate_check_bytes[ddir] =0 ; + td->last_rate_check_blocks[ddir] =0 ; td->bytes_done[ddir] =0 ; td->rate_io_issue_bytes[ddir] =0 ; td->rate_next_io_time[ddir] =0 ;