fio: allow milliseconds on all time specifiers
PATCH 3/9 fio: allow milliseconds on all time specifiers
*Resend with hopefully non mangled patches*
References: <[email protected]>
Content-Disposition: inline; filename=support-milliseconds.diff
From: Christian Ehrhardt <[email protected]>
This patch allows all time specifiers to be specified down to milliseconds. Default will stay seconds for compatibility with old configs.
It also adds documentation to the existing time units day, hour and minute.
Signed-off-by Christian Ehrhardt <[email protected]>
---
[diffstat]
backend.c | 4 ++-- eta.c | 14 ++++++++------ fio.1 | 16 ++++++++++------ parse.c | 48 ++++++++++++++++++++++++++++++++++-------------- time.c | 2 +- 5 files changed, 55 insertions(+), 29 deletions(-)
[diff]
backend.c +2 -2
@@ -346,7 +346,7 @@ static inline int runtime_exceeded(strucreturn 0 ;if (!td->o.timeout)return 0 ; -if (mtime_since (&td->epoch, t) >= td->o.timeout *1000 ) +if (mtime_since (&td->epoch, t) >= td->o.timeout )return 1 ;return 0 ;
@@ -1783,7 +1783,7 @@ static void run_threads(void)if (td->o.start_delay) { spent =mtime_since_genesis (); -if (td->o.start_delay *1000 > spent) +if (td->o.start_delay > spent)continue ; }
eta.c +8 -6
@@ -174,7 +174,8 @@ static int thread_eta(struct thread_data perc =1.0 ;if (td->o.time_based) { - perc_t = (double ) elapsed / (double ) td->o.timeout; + perc_t = (double ) elapsed / + (double ) (td->o.timeout /1000 );if (perc_t < perc) perc = perc_t; }
@@ -182,8 +183,9 @@ static int thread_eta(struct thread_data eta_sec = (unsigned long ) (elapsed * (1.0 / perc)) - elapsed;if (td->o.timeout && - eta_sec > (td->o.timeout + done_secs - elapsed)) - eta_sec = td->o.timeout + done_secs - elapsed; + eta_sec > ( (td->o.timeout /1000 ) + done_secs - elapsed)) + eta_sec = (td->o.timeout /1000 ) + done_secs + - elapsed; }else if (td->runstate ==TD_NOT_CREATED || td->runstate ==TD_CREATED || td->runstate ==TD_INITIALIZED || td->runstate == TD_SETTING_UP
@@ -197,8 +199,8 @@ static int thread_eta(struct thread_data* if given, otherwise assume it'll run at the specified rate. */ if (td->o.timeout) { - t_eta = td->o.timeout + td->o.start_delay + - td->o.ramp_time; + t_eta = (td->o.timeout + td->o.start_delay + + td->o.ramp_time ) /1000 ;if (in_ramp_time (td)) {unsigned long ramp_left;
@@ -212,7 +214,7 @@ static int thread_eta(struct thread_data rate_bytes =ddir_rw_sum (td->o.rate);if (rate_bytes) { r_eta = (bytes_total /1024 ) / rate_bytes; - r_eta += td->o.start_delay; + r_eta += td->o.start_delay /1000 ; }if (r_eta && t_eta)
fio.1 +10 -6
@@ -121,12 +121,16 @@ String: a sequence of alphanumeric chara SI integer: a whole number, possibly containing a suffix denoting the base unit of the value. Accepted suffixes are `k', 'M', 'G', 'T', and 'P', denoting kilo (1024), mega (1024^2), giga (1024^3), tera (1024^4), and peta (1024^5) -respectively. The suffix is not case sensitive. If prefixed with '0x', the -value is assumed to be base 16 (hexadecimal). A suffix may include a trailing 'b', -for instance 'kb' is identical to 'k'. You can specify a base 10 value -by using 'KiB', 'MiB', 'GiB', etc. This is useful for disk drives where -values are often given in base 10 values. Specifying '30GiB' will get you -30*1000^3 bytes. +respectively. If prefixed with '0x', the value is assumed to be base 16 +(hexadecimal). A suffix may include a trailing 'b', for instance 'kb' is +identical to 'k'. You can specify a base 10 value by using 'KiB', 'MiB','GiB', +etc. This is useful for disk drives where values are often given in base 10 +values. Specifying '30GiB' will get you 30*1000^3 bytes. +When specifying times the default suffix meaning changes, still denoting the +base unit of the value, but accepted suffixes are 'D' (days), 'H' (hours), 'M' +(minutes), 'S' Seconds, 'ms' milli seconds. Time values without a unit specify +seconds. +The suffixes are not case sensitive. .TP .I bool Boolean: a true or false value. `0' denotes false, `1' denotes true.
parse.c +34 -14
62 lines not on this page · raw message
time.c +1 -1
@@ -71,7 +71,7 @@ int ramp_time_over(struct thread_data *treturn 1 ;fio_gettime (&tv,NULL ); -if (mtime_since (&td->epoch, &tv) >= td->o.ramp_time *1000 ) { +if (mtime_since (&td->epoch, &tv) >= td->o.ramp_time ) { td->ramp_time_over =1 ;reset_all_stats (td);td_set_runstate (td,TD_RAMP );
Quoted 6 lines · On Thu, Feb 20 2014, [email protected] wrote:
From: Christian Ehrhardt <[email protected]>
This patch allows all time specifiers to be specified down to milliseconds. Default will stay seconds for compatibility with old configs.
It also adds documentation to the existing time units day, hour and minute.
THis breaks default delays being in usec, it's not in msec. So if you had some time set before on options that weren't specifically seconds, it now would be msec instead of usec. I will commit the below to fix this.
parse.c +9 -7
@@ -126,7 +126,7 @@ static unsigned long long get_mult_time(const char *str, int len) {const char *p = str;char *c; -unsigned long long mult =1000 ; +unsigned long long mult =1 ;/* * Go forward until we hit a non-digit, or +/- sign
@@ -138,22 +138,24 @@ static unsigned long long get_mult_time(const char *str, int len) }if (!isalpha ((int ) *p)) -return 1000 ; +return mult; c =strdup (p);for (int i =0 ; i <strlen (c); i++) c[i] =tolower (c[i]); -if (!strncmp ("ms" , c,2 )) +if (!strncmp ("us" , c,2 ) || !strncmp ("usec" , c,4 )) mult =1 ; -else if (!strcmp ("s" , c)) +else if (!strncmp ("ms" , c,2 ) || !strncmp ("msec" , c,4 )) mult =1000 ; +else if (!strcmp ("s" , c)) + mult =1000000 ;else if (!strcmp ("m" , c)) - mult =60 *1000 ; + mult =60 *1000000UL ;else if (!strcmp ("h" , c)) - mult =60 *60 *1000 ; + mult =60 *60 *1000000UL ;else if (!strcmp ("d" , c)) - mult =24 *60 *60 *1000 ; + mult =24 *60 *60 *1000000UL ;free (c);return mult;
Signature · 1 line
Jens Axboe