projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix invalid ioengine initialization for cpp_null
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index 8ed4619e6e08f765b783e3c59f3bf7b5632faf2d..518c2dff45f0052c1a7c7da01f61db751b7835d2 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-207,32
+207,50
@@
static unsigned long long __get_mult_bytes(const char *p, void *data,
}
}
}
}
+ /* If kb_base is 1000, use true units.
+ * If kb_base is 1024, use opposite units.
+ */
if (!strncmp("pib", c, 3)) {
pow = 5;
if (!strncmp("pib", c, 3)) {
pow = 5;
- mult = 1000;
+ if (kb_base == 1000)
+ mult = 1024;
+ else if (kb_base == 1024)
+ mult = 1000;
} else if (!strncmp("tib", c, 3)) {
pow = 4;
} else if (!strncmp("tib", c, 3)) {
pow = 4;
- mult = 1000;
+ if (kb_base == 1000)
+ mult = 1024;
+ else if (kb_base == 1024)
+ mult = 1000;
} else if (!strncmp("gib", c, 3)) {
pow = 3;
} else if (!strncmp("gib", c, 3)) {
pow = 3;
- mult = 1000;
+ if (kb_base == 1000)
+ mult = 1024;
+ else if (kb_base == 1024)
+ mult = 1000;
} else if (!strncmp("mib", c, 3)) {
pow = 2;
} else if (!strncmp("mib", c, 3)) {
pow = 2;
- mult = 1000;
+ if (kb_base == 1000)
+ mult = 1024;
+ else if (kb_base == 1024)
+ mult = 1000;
} else if (!strncmp("kib", c, 3)) {
pow = 1;
} else if (!strncmp("kib", c, 3)) {
pow = 1;
- mult = 1000;
- } else if (!strncmp("p", c, 1) || !strncmp("pb", c, 2))
+ if (kb_base == 1000)
+ mult = 1024;
+ else if (kb_base == 1024)
+ mult = 1000;
+ } else if (!strncmp("p", c, 1) || !strncmp("pb", c, 2)) {
pow = 5;
pow = 5;
- else if (!strncmp("t", c, 1) || !strncmp("tb", c, 2))
+ } else if (!strncmp("t", c, 1) || !strncmp("tb", c, 2)) {
pow = 4;
pow = 4;
- else if (!strncmp("g", c, 1) || !strncmp("gb", c, 2))
+ } else if (!strncmp("g", c, 1) || !strncmp("gb", c, 2)) {
pow = 3;
pow = 3;
- else if (!strncmp("m", c, 1) || !strncmp("mb", c, 2))
+ } else if (!strncmp("m", c, 1) || !strncmp("mb", c, 2)) {
pow = 2;
pow = 2;
- else if (!strncmp("k", c, 1) || !strncmp("kb", c, 2))
+ } else if (!strncmp("k", c, 1) || !strncmp("kb", c, 2)) {
pow = 1;
pow = 1;
- else if (!strncmp("%", c, 1)) {
+
}
else if (!strncmp("%", c, 1)) {
*percent = 1;
free(c);
return ret;
*percent = 1;
free(c);
return ret;