Recent changes (master)
The following changes since commit 7b57011427a8204bd63671b08dde56cd9e879d68:
t/fiotestlib: make recorded command prettier (2023-08-02 12:58:16 -0400)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 62f35562722f0c903567096d0f10a836d1ae2f60:
eta: calculate aggregate bw statistics even when eta is disabled (2023-08-03 11:49:08 -0400)
----------------------------------------------------------------
Vincent Fu (1):
eta: calculate aggregate bw statistics even when eta is disabled
eta.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
---
Diff of recent changes:
eta.c +22 -8
@@ -375,6 +375,22 @@ bool eta_time_within_slack(unsigned int time)return time > ((eta_interval_msec *95 ) /100 ); } +/* +* These are the conditions under which we might be able to skip the eta +* calculation. +*/ +static bool skip_eta () +{ +if (!(output_format &FIO_OUTPUT_NORMAL ) && f_out == stdout) +return true; +if (temp_stall_ts || eta_print ==FIO_ETA_NEVER ) +return true; +if (!isatty (STDOUT_FILENO ) && eta_print !=FIO_ETA_ALWAYS ) +return true; + +return false; +} +/* * Print status of the jobs we know about. This includes rate estimates, * ETA, thread state, etc.
@@ -393,14 +409,12 @@ bool calc_thread_status(struct jobs_eta *je, int force)static unsigned long long disp_io_iops[DDIR_RWDIR_CNT ];static struct timespec rate_prev_time, disp_prev_time; -if (!force) { -if (!(output_format &FIO_OUTPUT_NORMAL ) && - f_out == stdout) -return false; -if (temp_stall_ts || eta_print ==FIO_ETA_NEVER ) -return false; +bool ret = true; -if (!isatty (STDOUT_FILENO ) && (eta_print !=FIO_ETA_ALWAYS )) +if (!force &&skip_eta ()) { +if (write_bw_log) + ret = false; +else return false; }
@@ -534,7 +548,7 @@ bool calc_thread_status(struct jobs_eta *je, int force) je->nr_threads = thread_number;update_condensed_str (__run_str, run_str);memcpy (je->run_str, run_str,strlen (run_str)); -return true; +return ret; } static int gen_eta_str(struct jobs_eta *je, char *p, size_t left,