Recent changes (master)
The following changes since commit 63176c21beb68ec54787eb2fd6be5b3c9132113b:
examples: add examples for cmdprio_* IO priority options (2021-09-03 10:12:25 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to f7942acdc23a4ee837ef30834e1d2cb1fc6d0afe:
options: Add thinktime_iotime option (2021-09-05 21:11:25 -0600)
----------------------------------------------------------------
Shin'ichiro Kawasaki (1):
options: Add thinktime_iotime option
HOWTO | 14 +++++++++++++- backend.c | 45 +++++++++++++++++++++++++++++++++++++++------ cconv.c | 2 ++ fio.1 | 13 ++++++++++++- fio.h | 2 ++ options.c | 14 ++++++++++++++ server.h | 2 +- thread_options.h | 21 ++++++++++++--------- 8 files changed, 95 insertions(+), 18 deletions(-)
---
Diff of recent changes:
HOWTO +13 -1
@@ -2745,7 +2745,7 @@ I/O rate Stall the job for the specified period of time after an I/O has completed before issuing the next. May be used to simulate processing being done by an application. When the unit is omitted, the value is interpreted in microseconds. See - :option:`thinktime_blocks` and :option:`thinktime_spin`. + :option:`thinktime_blocks`, :option:`thinktime_iotime` and :option:`thinktime_spin`. .. option:: thinktime_spin=time
@@ -2770,6 +2770,18 @@ I/O rate :option:`thinktime_blocks` blocks. If this is set to `issue`, then the trigger happens at the issue side. +.. option:: thinktime_iotime=time + + Only valid if :option:`thinktime` is set - control :option:`thinktime` + interval by time. The :option:`thinktime` stall is repeated after IOs + are executed for :option:`thinktime_iotime`. For example, + ``--thinktime_iotime=9s --thinktime=1s`` repeat 10-second cycle with IOs + for 9 seconds and stall for 1 second. When the unit is omitted, + :option:`thinktime_iotime` is interpreted as a number of seconds. If + this option is used together with :option:`thinktime_blocks`, the + :option:`thinktime` stall is repeated after :option:`thinktime_iotime` + or after :option:`thinktime_blocks` IOs, whichever happens first. + .. option:: rate=int[,int][,int] Cap the bandwidth used by this job. The number is in bytes/sec, the normal
backend.c +39 -6
77 lines not on this page · raw message
cconv.c +2 -0
@@ -214,6 +214,7 @@ void convert_thread_options_to_cpu(struct thread_options *o, o->thinktime_spin =le32_to_cpu (top->thinktime_spin); o->thinktime_blocks =le32_to_cpu (top->thinktime_blocks); o->thinktime_blocks_type =le32_to_cpu (top->thinktime_blocks_type); + o->thinktime_iotime =le32_to_cpu (top->thinktime_iotime); o->fsync_blocks =le32_to_cpu (top->fsync_blocks); o->fdatasync_blocks =le32_to_cpu (top->fdatasync_blocks); o->barrier_blocks =le32_to_cpu (top->barrier_blocks);
@@ -440,6 +441,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top, top->thinktime_spin =cpu_to_le32 (o->thinktime_spin); top->thinktime_blocks =cpu_to_le32 (o->thinktime_blocks); top->thinktime_blocks_type =__cpu_to_le32 (o->thinktime_blocks_type); + top->thinktime_iotime =__cpu_to_le32 (o->thinktime_iotime); top->fsync_blocks =cpu_to_le32 (o->fsync_blocks); top->fdatasync_blocks =cpu_to_le32 (o->fdatasync_blocks); top->barrier_blocks =cpu_to_le32 (o->barrier_blocks);
fio.1 +12 -1
@@ -2499,7 +2499,7 @@ problem). Note that this option cannot reliably be used with async IO engines. Stall the job for the specified period of time after an I/O has completed before issuing the next. May be used to simulate processing being done by an application. When the unit is omitted, the value is interpreted in microseconds. See -\fBthinktime_blocks\fR and \fBthinktime_spin\fR. +\fBthinktime_blocks\fR, \fBthinktime_iotime\fR and \fBthinktime_spin\fR. .TP .BI thinktime_spin \fR=\fPtime Only valid if \fBthinktime\fR is set - pretend to spend CPU time doing
@@ -2520,6 +2520,17 @@ Only valid if \fBthinktime\fR is set - control how \fBthinktime_blocks\fR trigge The default is `complete', which triggers \fBthinktime\fR when fio completes \fBthinktime_blocks\fR blocks. If this is set to `issue', then the trigger happens at the issue side. +.TP +.BI thinktime_iotime \fR=\fPtime +Only valid if \fBthinktime\fR is set - control \fBthinktime\fR interval by time. +The \fBthinktime\fR stall is repeated after IOs are executed for +\fBthinktime_iotime\fR. For example, `\-\-thinktime_iotime=9s \-\-thinktime=1s' +repeat 10-second cycle with IOs for 9 seconds and stall for 1 second. When the +unit is omitted, \fBthinktime_iotime\fR is interpreted as a number of seconds. +If this option is used together with \fBthinktime_blocks\fR, the \fBthinktime\fR +stall is repeated after \fBthinktime_iotime\fR or after \fBthinktime_blocks\fR +IOs, whichever happens first. + .TP .BI rate \fR=\fPint[,int][,int] Cap the bandwidth used by this job. The number is in bytes/sec, the normal
fio.h +2 -0
@@ -370,6 +370,8 @@ struct thread_data {uint64_t bytes_done[DDIR_RWDIR_CNT ];uint64_t *thinktime_blocks_counter; +struct timespec last_thinktime; +uint64_t last_thinktime_blocks;/* * State for random io, a bitmap of blocks done vs not done
options.c +14 -0
@@ -3680,6 +3680,20 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { }, .parent = "thinktime", }, + { + .name = "thinktime_iotime", + .lname = "Thinktime interval", + .type = FIO_OPT_INT, + .off1 = offsetof(struct thread_options, thinktime_iotime), + .help = "IO time interval between 'thinktime'", + .def = "0", + .parent = "thinktime", + .hide = 1, + .is_seconds = 1, + .is_time = 1, + .category = FIO_OPT_C_IO, + .group = FIO_OPT_G_THINKTIME, + }, { .name = "rate", .lname = "I/O rate",
server.h +1 -1
@@ -48,7 +48,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =93 , +FIO_SERVER_VER =94 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
thread_options.h +12 -9
@@ -191,10 +191,6 @@ struct thread_options {unsigned int hugepage_size;unsigned long long rw_min_bs; -unsigned int thinktime; -unsigned int thinktime_spin; -unsigned int thinktime_blocks; -unsigned int thinktime_blocks_type;unsigned int fsync_blocks;unsigned int fdatasync_blocks;unsigned int barrier_blocks;
@@ -303,6 +299,12 @@ struct thread_options {char *exec_prerun;char *exec_postrun; +unsigned int thinktime; +unsigned int thinktime_spin; +unsigned int thinktime_blocks; +unsigned int thinktime_blocks_type; +unsigned int thinktime_iotime; +uint64_t rate[DDIR_RWDIR_CNT ];uint64_t ratemin[DDIR_RWDIR_CNT ];unsigned int ratecycle;
@@ -504,10 +506,6 @@ struct thread_options_pack {uint32_t hugepage_size;uint64_t rw_min_bs; -uint32_t thinktime; -uint32_t thinktime_spin; -uint32_t thinktime_blocks; -uint32_t thinktime_blocks_type;uint32_t fsync_blocks;uint32_t fdatasync_blocks;uint32_t barrier_blocks;
@@ -612,6 +610,12 @@ struct thread_options_pack {uint8_t exec_prerun[FIO_TOP_STR_MAX ];uint8_t exec_postrun[FIO_TOP_STR_MAX ]; +uint32_t thinktime; +uint32_t thinktime_spin; +uint32_t thinktime_blocks; +uint32_t thinktime_blocks_type; +uint32_t thinktime_iotime; +uint64_t rate[DDIR_RWDIR_CNT ];uint64_t ratemin[DDIR_RWDIR_CNT ];uint32_t ratecycle;
@@ -651,7 +655,6 @@ struct thread_options_pack {uint64_t latency_target;uint64_t latency_window;uint64_t max_latency[DDIR_RWDIR_CNT ]; -uint32_t pad5;fio_fp64_t latency_percentile;uint32_t latency_run;