fio: allow milliseconds on all time specifiers
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 <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/parse.c b/parse.c
index e46fc14..c8bae03 100644
--- a/parse.c
+++ b/parse.c
@@ -122,21 +122,41 @@
show_option_values(o);
}
-static unsigned long get_mult_time(char c)
+static unsigned long long get_mult_time(const char *str, int len)
{
- switch (c) {
- case 'm':
- case 'M':
- return 60;
- case 'h':
- case 'H':
- return 60 * 60;
- case 'd':
- case 'D':
- return 24 * 60 * 60;
- default:
- return 1;
+ const char *p = str;
+ char *c;
+ unsigned long long mult = 1000;
+
+ /*
+ * Go forward until we hit a non-digit, or +/- sign
+ */
+ while ((p - str) <= len) {
+ if (!isdigit((int) *p) && (*p != '+') && (*p != '-'))
+ break;
+ p++;
}
+
+ if (!isalpha((int) *p))
+ return 1000;
+
+ c = strdup(p);
+ for (int i = 0; i < strlen(c); i++)
+ c[i] = tolower(c[i]);
+
+ if (!strncmp("ms", c, 2))
+ mult = 1;
+ else if (!strcmp("s", c))
+ mult = 1000;
+ else if (!strcmp("m", c))
+ mult = 60 * 1000;
+ else if (!strcmp("h", c))
+ mult = 60 * 60 * 1000;
+ else if (!strcmp("d", c))
+ mult = 24 * 60 * 60 * 1000;
+
+ free(c);
+ return mult;
}
static int is_separator(char c)
@@ -275,7 +295,7 @@
else
*val *= mult;
} else
- *val *= get_mult_time(str[len - 1]);
+ *val *= get_mult_time(str, len);
return 0;
}