Recent changes (master)
The following changes since commit 270316dd2566346a12cfdf3cbe9996a88307f87d:
Merge branch 'master' of https://github.com/bvanassche/fio (2023-07-13 15:28:20 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 14adf6e31487aa2bc8e47cd037428036089a3834:
thinktime: Avoid calculating a negative time left to wait (2023-07-14 14:03:34 -0400)
----------------------------------------------------------------
Michael Kelley (1):
thinktime: Avoid calculating a negative time left to wait
Vincent Fu (2):
stat: add new diskutil sectors to json output
stat: add diskutil aggregated sectors to normal output
backend.c | 11 ++++++++++- stat.c | 14 +++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-)
---
Diff of recent changes:
backend.c +10 -1
@@ -897,7 +897,16 @@ static void handle_thinktime(struct thread_data *td, enum fio_ddir ddir,if (left) total =usec_spin (left); - left = td->o.thinktime - total; +/* +* usec_spin() might run for slightly longer than intended in a VM +* where the vCPU could get descheduled or the hypervisor could steal +* CPU time. Ensure "left" doesn't become negative. +*/ +if (total < td->o.thinktime) + left = td->o.thinktime - total; +else + left =0 ; +if (td->o.timeout) { runtime_left = td->o.timeout -utime_since_now (&td->epoch);if (runtime_left < (unsigned long long )left)
stat.c +11 -3
@@ -957,11 +957,13 @@ static void show_agg_stats(struct disk_util_agg *agg, int terse,return ;if (!terse) { - log_buf(out, ", aggrios=%llu/%llu, aggrmerge=%llu/%llu, " - "aggrticks=%llu/%llu, aggrin_queue=%llu, " - "aggrutil=%3.2f%%", + log_buf(out, ", aggrios=%llu/%llu, aggsectors=%llu/%llu, " + "aggrmerge=%llu/%llu, aggrticks=%llu/%llu, " + "aggrin_queue=%llu, aggrutil=%3.2f%%", (unsigned long long) agg->ios[0] / agg->slavecount, (unsigned long long) agg->ios[1] / agg->slavecount, + (unsigned long long) agg->sectors[0] / agg->slavecount, + (unsigned long long) agg->sectors[1] / agg->slavecount, (unsigned long long) agg->merges[0] / agg->slavecount, (unsigned long long) agg->merges[1] / agg->slavecount, (unsigned long long) agg->ticks[0] / agg->slavecount,
@@ -1084,6 +1086,8 @@ void json_array_add_disk_util(struct disk_util_stat *dus,json_object_add_value_string (obj,"name" , (const char *)dus->name);json_object_add_value_int (obj,"read_ios" , dus->s.ios[0 ]);json_object_add_value_int (obj,"write_ios" , dus->s.ios[1 ]); +json_object_add_value_int (obj,"read_sectors" , dus->s.sectors[0 ]); +json_object_add_value_int (obj,"write_sectors" , dus->s.sectors[1 ]);json_object_add_value_int (obj,"read_merges" , dus->s.merges[0 ]);json_object_add_value_int (obj,"write_merges" , dus->s.merges[1 ]);json_object_add_value_int (obj,"read_ticks" , dus->s.ticks[0 ]);
@@ -1101,6 +1105,10 @@ void json_array_add_disk_util(struct disk_util_stat *dus, agg->ios[0] / agg->slavecount);json_object_add_value_int (obj,"aggr_write_ios" , agg->ios[1 ] / agg->slavecount); +json_object_add_value_int (obj,"aggr_read_sectors" , + agg->sectors[0 ] / agg->slavecount); +json_object_add_value_int (obj,"aggr_write_sectors" , + agg->sectors[1 ] / agg->slavecount);json_object_add_value_int (obj,"aggr_read_merges" , agg->merges[0 ] / agg->slavecount); json_object_add_value_int(obj, "aggr_write_merge",