projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gfio: add *.ini as fio job file filter
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index 7f7851cbb662e5f13574e228cb15505c63964574..f1d5f8f8a72922a85d511528b58f9796c77c337b 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-180,6
+180,7
@@
static unsigned long long __get_mult_bytes(const char *p, void *data,
pow = 1;
else if (!strcmp("%", c)) {
*percent = 1;
pow = 1;
else if (!strcmp("%", c)) {
*percent = 1;
+ free(c);
return ret;
}
return ret;
}
@@
-219,7
+220,7
@@
static unsigned long long get_mult_bytes(const char *str, int len, void *data,
/*
* Convert string into a floating number. Return 1 for success and 0 otherwise.
*/
/*
* Convert string into a floating number. Return 1 for success and 0 otherwise.
*/
-int str_to_float(const char *str, double *val)
+
static
int str_to_float(const char *str, double *val)
{
return (1 == sscanf(str, "%lf", val));
}
{
return (1 == sscanf(str, "%lf", val));
}
@@
-501,45
+502,54
@@
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
- posval_sort(o, posval);
+ if (o->roff1 || o->off1) {
+ if (o->roff1)
+ cp = (char **) o->roff1;
+ else if (o->off1)
+ cp = td_var(data, o->off1);
- if (!o->posval[0].ival) {
- vp = NULL;
-
goto match
;
+ *cp = strdup(ptr);
+ } else {
+
cp = NULL
;
}
}
- ret = 1;
- for (i = 0; i < PARSE_MAX_VP; i++) {
- vp = &posval[i];
- if (!vp->ival || vp->ival[0] == '\0')
- continue;
- all_skipped = 0;
- if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
- char *rest;
+ if (fn)
+ ret = fn(data, ptr);
+ else if (o->posval[0].ival) {
+ posval_sort(o, posval);
- ret = 0;
- if (vp->cb)
- fn = vp->cb;
-match:
- if (o->roff1)
- cp = (char **) o->roff1;
- else
- cp = td_var(data, o->off1);
- *cp = strdup(ptr);
- rest = strstr(*cp, ":");
- if (rest) {
- *rest = '\0';
- ptr = rest + 1;
- } else if (vp && vp->cb)
- ptr = NULL;
- break;
+ ret = 1;
+ for (i = 0; i < PARSE_MAX_VP; i++) {
+ vp = &posval[i];
+ if (!vp->ival || vp->ival[0] == '\0')
+ continue;
+ all_skipped = 0;
+ if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
+ char *rest;
+
+ ret = 0;
+ if (vp->cb)
+ fn = vp->cb;
+ rest = strstr(*cp ?: ptr, ":");
+ if (rest) {
+ if (*cp)
+ *rest = '\0';
+ ptr = rest + 1;
+ } else
+ ptr = NULL;
+ break;
+ }
}
}
}
}
- if (ret && !all_skipped)
- show_option_values(o);
- else if (fn && ptr)
- ret = fn(data, ptr);
+ if (!all_skipped) {
+ if (ret && !*cp)
+ show_option_values(o);
+ else if (ret && *cp)
+ ret = 0;
+ else if (fn && ptr)
+ ret = fn(data, ptr);
+ }
break;
}
break;
}
@@
-728,7
+738,7
@@
static int handle_option(struct fio_option *o, const char *__ptr, void *data)
return ret;
}
return ret;
}
-static struct fio_option *get_option(c
onst c
har *opt,
+static struct fio_option *get_option(char *opt,
struct fio_option *options, char **post)
{
struct fio_option *o;
struct fio_option *options, char **post)
{
struct fio_option *o;
@@
-738,7
+748,7
@@
static struct fio_option *get_option(const char *opt,
if (ret) {
*post = ret;
*ret = '\0';
if (ret) {
*post = ret;
*ret = '\0';
- ret =
(char *)
opt;
+ ret = opt;
(*post)++;
strip_blank_end(ret);
o = find_option(options, ret);
(*post)++;
strip_blank_end(ret);
o = find_option(options, ret);
@@
-752,24
+762,27
@@
static struct fio_option *get_option(const char *opt,
static int opt_cmp(const void *p1, const void *p2)
{
static int opt_cmp(const void *p1, const void *p2)
{
- struct fio_option *o
1, *o2
;
- char *s
1, *s2
, *foo;
+ struct fio_option *o;
+ char *s, *foo;
int prio1, prio2;
int prio1, prio2;
- s1 = strdup(*((char **) p1));
- s2 = strdup(*((char **) p2));
-
- o1 = get_option(s1, fio_options, &foo);
- o2 = get_option(s2, fio_options, &foo);
-
prio1 = prio2 = 0;
prio1 = prio2 = 0;
- if (o1)
- prio1 = o1->prio;
- if (o2)
- prio2 = o2->prio;
- free(s1);
- free(s2);
+ if (*(char **)p1) {
+ s = strdup(*((char **) p1));
+ o = get_option(s, fio_options, &foo);
+ if (o)
+ prio1 = o->prio;
+ free(s);
+ }
+ if (*(char **)p2) {
+ s = strdup(*((char **) p2));
+ o = get_option(s, fio_options, &foo);
+ if (o)
+ prio2 = o->prio;
+ free(s);
+ }
+
return prio2 - prio1;
}
return prio2 - prio1;
}
@@
-798,24
+811,29
@@
int parse_cmd_option(const char *opt, const char *val,
return 1;
}
return 1;
}
-int parse_option(c
onst c
har *opt, const char *input,
- struct fio_option *options, void *data)
+int parse_option(char *opt, const char *input,
+ struct fio_option *options,
struct fio_option **o,
void *data)
{
{
- struct fio_option *o;
char *post;
if (!opt) {
log_err("fio: failed parsing %s\n", input);
char *post;
if (!opt) {
log_err("fio: failed parsing %s\n", input);
+ *o = NULL;
return 1;
}
return 1;
}
- o = get_option(opt, options, &post);
- if (!o) {
- log_err("Bad option <%s>\n", input);
+ *o = get_option(opt, options, &post);
+ if (!*o) {
+ if (post) {
+ int len = strlen(opt);
+ if (opt + len + 1 != post)
+ memmove(opt + len + 1, post, strlen(post));
+ opt[len] = '=';
+ }
return 1;
}
return 1;
}
- if (!handle_option(o, post, data)) {
+ if (!handle_option(
*
o, post, data)) {
return 0;
}
return 0;
}
@@
-1053,7
+1071,7
@@
void options_free(struct fio_option *options, void *data)
dprint(FD_PARSE, "free options\n");
for (o = &options[0]; o->name; o++) {
dprint(FD_PARSE, "free options\n");
for (o = &options[0]; o->name; o++) {
- if (o->type != FIO_OPT_STR_STORE)
+ if (o->type != FIO_OPT_STR_STORE
|| !o->off1
)
continue;
ptr = td_var(data, o->off1);
continue;
ptr = td_var(data, o->off1);