projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Further improve child exit reaping
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index 29e2ff1ce9d347a8017f1685711264bcdd6900e0..7fb2bb6399cc564b038f6889a5f2fb3f603b5719 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-40,6
+40,9
@@
static unsigned long get_mult_bytes(char c)
case 'g':
case 'G':
return 1024 * 1024 * 1024;
case 'g':
case 'G':
return 1024 * 1024 * 1024;
+ case 'e':
+ case 'E':
+ return 1024 * 1024 * 1024 * 1024UL;
default:
return 1;
}
default:
return 1;
}
@@
-56,7
+59,7
@@
static int str_to_decimal(const char *str, long long *val, int kilo)
if (!len)
return 1;
if (!len)
return 1;
- *val = strtol(str, NULL, 10);
+ *val = strtol
l
(str, NULL, 10);
if (*val == LONG_MAX && errno == ERANGE)
return 1;
if (*val == LONG_MAX && errno == ERANGE)
return 1;
@@
-312,7
+315,7
@@
static int handle_option(struct fio_option *o, const char *ptr, void *data)
* Do this before parsing the first round, to check if we should
* copy set 1 options to set 2.
*/
* Do this before parsing the first round, to check if we should
* copy set 1 options to set 2.
*/
- if (ptr) {
+ if (ptr
&& (o->type != FIO_OPT_STR_STORE)
) {
ptr2 = strchr(ptr, ',');
if (!ptr2)
ptr2 = strchr(ptr, ':');
ptr2 = strchr(ptr, ',');
if (!ptr2)
ptr2 = strchr(ptr, ':');