projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile: don't install test binaries
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index 3a5fbcc4bff557da86edc54f08a8a2abd8b20f07..9e31908aebf41bf17ba69fbcfb68947839099cd7 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-269,7
+269,7
@@
static unsigned long long get_mult_bytes(const char *str, int len, void *data,
}
extern int evaluate_arithmetic_expression(const char *buffer, long long *ival,
}
extern int evaluate_arithmetic_expression(const char *buffer, long long *ival,
- double *dval);
+ double *dval
, double implied_units
);
#ifdef CONFIG_ARITHMETIC
/*
#ifdef CONFIG_ARITHMETIC
/*
@@
-278,7
+278,7
@@
extern int evaluate_arithmetic_expression(const char *buffer, long long *ival,
* original number parsing code. Once sufficiently sure that the arithmetic
* code is always getting the right answers, these can be removed.
*/
* original number parsing code. Once sufficiently sure that the arithmetic
* code is always getting the right answers, these can be removed.
*/
-static void verify_exp_parser_float(const char *str)
+static void verify_exp_parser_float(const char *str
, double implied_units
)
{
long long ival;
double dval, tmpval;
{
long long ival;
double dval, tmpval;
@@
-286,7
+286,7
@@
static void verify_exp_parser_float(const char *str)
if (sscanf(str, "%lf", &tmpval) != 1)
return;
if (sscanf(str, "%lf", &tmpval) != 1)
return;
- if (evaluate_arithmetic_expression(str, &ival, &dval) != 0) {
+ if (evaluate_arithmetic_expression(str, &ival, &dval
, implied_units
) != 0) {
log_info("Arithmetic failed on '%s'\n", str);
return;
}
log_info("Arithmetic failed on '%s'\n", str);
return;
}
@@
-301,8
+301,12
@@
static void verify_exp_parser_decimal(const char *str, long long val, int kilo,
int rc;
long long ival;
double dval;
int rc;
long long ival;
double dval;
+ double implied_units = 1.0;
- rc = evaluate_arithmetic_expression(str, &ival, &dval);
+ if (is_seconds)
+ implied_units = 1000000.0;
+
+ rc = evaluate_arithmetic_expression(str, &ival, &dval, implied_units);
if (!rc) {
if (ival != val)
log_info("Arithmetic failed on '%s', expected %lld, got %lld\n",
if (!rc) {
if (ival != val)
log_info("Arithmetic failed on '%s', expected %lld, got %lld\n",
@@
-324,13
+328,13
@@
int str_to_float(const char *str, double *val)
double dval;
if (str[0] == '(') {
double dval;
if (str[0] == '(') {
- rc = evaluate_arithmetic_expression(str, &ival, &dval);
+ rc = evaluate_arithmetic_expression(str, &ival, &dval
, 1.0
);
if (!rc) {
*val = dval;
return 1;
}
} else {
if (!rc) {
*val = dval;
return 1;
}
} else {
- verify_exp_parser_float(str);
+ verify_exp_parser_float(str
, 1.0
);
}
#endif
return 1 == sscanf(str, "%lf", val);
}
#endif
return 1 == sscanf(str, "%lf", val);
@@
-347,6
+351,7
@@
int str_to_decimal(const char *str, long long *val, int kilo, void *data,
#ifdef CONFIG_ARITHMETIC
long long ival;
double dval;
#ifdef CONFIG_ARITHMETIC
long long ival;
double dval;
+ double implied_units = 1.0;
#endif
len = strlen(str);
#endif
len = strlen(str);
@@
-354,8
+359,10
@@
int str_to_decimal(const char *str, long long *val, int kilo, void *data,
return 1;
#ifdef CONFIG_ARITHMETIC
return 1;
#ifdef CONFIG_ARITHMETIC
+ if (is_seconds)
+ implied_units = 1000000.0;
if (str[0] == '(')
if (str[0] == '(')
- rc = evaluate_arithmetic_expression(str, &ival, &dval);
+ rc = evaluate_arithmetic_expression(str, &ival, &dval
, implied_units
);
if (str[0] == '(' && !rc) {
if (!kilo && is_seconds)
*val = ival / 1000000LL;
if (str[0] == '(' && !rc) {
if (!kilo && is_seconds)
*val = ival / 1000000LL;