[PATCH] Cleanup 2nd argument set parsing/setting

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 9f2ee0d653c7fcdc781caa4eea1a46eee4776074..12f769798b778102dc7175edcc35e20b7ecd7187 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -53,6 +53,8 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
        int len;
 
        len = strlen(str);
+       if (!len)
+               return 1;
 
        *val = strtoul(str, NULL, 10);
        if (*val == ULONG_MAX && errno == ERANGE)
@@ -131,11 +133,18 @@ static struct fio_option *find_option(struct fio_option *options,
        return NULL;
 }
 
-static int handle_option(struct fio_option *o, const char *ptr, void *data)
+#define val_store(ptr, val, off, data)                 \
+       do {                                            \
+               ptr = td_var((data), (off));            \
+               *ptr = (val);                           \
+       } while (0)
+
+static int __handle_option(struct fio_option *o, const char *ptr, void *data,
+                          int first)
 {
        unsigned int il, *ilp;
        unsigned long long ull, *ullp;
-       unsigned long ul1, ul2, *ulp1, *ulp2;
+       unsigned long ul1, ul2;
        char **cp;
        int ret = 0, is_time = 0;
 
@@ -148,7 +157,8 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
        }
        case FIO_OPT_STR_VAL_TIME:
                is_time = 1;
-       case FIO_OPT_STR_VAL: {
+       case FIO_OPT_STR_VAL:
+       case FIO_OPT_STR_VAL_INT: {
                fio_opt_str_val_fn *fn = o->cb;
 
                if (is_time)
@@ -165,8 +175,17 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
                if (fn)
                        ret = fn(data, &ull);
                else {
-                       ullp = td_var(data, o->off1);
-                       *ullp = ull;
+                       if (o->type == FIO_OPT_STR_VAL_INT) {
+                               if (first)
+                                       val_store(ilp, ull, o->off1, data);
+                               if (o->off2)
+                                       val_store(ilp, ull, o->off2, data);
+                       } else {
+                               if (first)
+                                       val_store(ullp, ull, o->off1, data);
+                               if (o->off2)
+                                       val_store(ullp, ull, o->off2, data);
+                       }
                }
                break;
        }
@@ -193,17 +212,23 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
                ret = 1;
                if (!check_range_bytes(p1, &ul1) && !check_range_bytes(p2, &ul2)) {
                        ret = 0;
-                       ulp1 = td_var(data, o->off1);
-                       ulp2 = td_var(data, o->off2);
                        if (ul1 > ul2) {
-                               *ulp1 = ul2;
-                               *ulp2 = ul1;
-                       } else {
-                               *ulp2 = ul2;
-                               *ulp1 = ul1;
+                               unsigned long foo = ul1;
+
+                               ul1 = ul2;
+                               ul2 = foo;
+                       }
+
+                       if (first) {
+                               val_store(ilp, ul1, o->off1, data);
+                               val_store(ilp, ul2, o->off2, data);
                        }
-               }       
-                       
+                       if (o->off3 && o->off4) {
+                               val_store(ilp, ul1, o->off3, data);
+                               val_store(ilp, ul2, o->off4, data);
+                       }
+               }
+
                break;
        }
        case FIO_OPT_INT: {
@@ -219,8 +244,10 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
                if (fn)
                        ret = fn(data, &il);
                else {
-                       ilp = td_var(data, o->off1);
-                       *ilp = il;
+                       if (first)
+                               val_store(ilp, il, o->off1, data);
+                       if (o->off2)
+                               val_store(ilp, il, o->off2, data);
                }
                break;
        }
@@ -230,8 +257,10 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
                if (fn)
                        ret = fn(data);
                else {
-                       ilp = td_var(data, o->off1);
-                       *ilp = 1;
+                       if (first)
+                               val_store(ilp, 1, o->off1, data);
+                       if (o->off2)
+                               val_store(ilp, 1, o->off2, data);
                }
                break;
        }
@@ -243,6 +272,26 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
        return ret;
 }
 
+static int handle_option(struct fio_option *o, const char *ptr, void *data)
+{
+       const char *ptr2;
+       int ret;
+
+       ret = __handle_option(o, ptr, data, 1);
+       if (ret)
+               return ret;
+
+       /*
+        * See if we have a second set of parameters, hidden after a comma
+        */
+       ptr2 = strchr(ptr, ',');
+       if (!ptr2)
+               return 0;
+
+       ptr2++;
+       return __handle_option(o, ptr2, data, 0);
+}
+
 int parse_cmd_option(const char *opt, const char *val,
                     struct fio_option *options, void *data)
 {