parse: fix bssplit option

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index deb4120fdc4d9f432a6e16dd8fd9507a0dadda5f..952118c6036ddf7fc6fd9cf49a3d13350920c976 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -26,16 +26,19 @@
 static const char *opt_type_names[] = {
        "OPT_INVALID",
        "OPT_STR",
+       "OPT_STR_ULL",
        "OPT_STR_MULTI",
        "OPT_STR_VAL",
        "OPT_STR_VAL_TIME",
        "OPT_STR_STORE",
        "OPT_RANGE",
        "OPT_INT",
+       "OPT_ULL",
        "OPT_BOOL",
        "OPT_FLOAT_LIST",
        "OPT_STR_SET",
        "OPT_DEPRECATED",
+       "OPT_SOFT_DEPRECATED",
        "OPT_UNSUPPORTED",
 };
 
@@ -68,16 +71,20 @@ static void posval_sort(const struct fio_option *o, struct value_pair *vpmap)
 }
 
 static void show_option_range(const struct fio_option *o,
-                             size_t (*logger)(const char *format, ...))
+                             ssize_t (*logger)(const char *format, ...))
 {
        if (o->type == FIO_OPT_FLOAT_LIST) {
+               const char *sep = "";
                if (!o->minfp && !o->maxfp)
                        return;
 
-               if (o->minfp != DBL_MIN)
-                       logger("%20s: min=%f", "range", o->minfp);
+               logger("%20s: ", "range");
+               if (o->minfp != DBL_MIN) {
+                       logger("min=%f", o->minfp);
+                       sep = ", ";
+               }
                if (o->maxfp != DBL_MAX)
-                       logger(", max=%f", o->maxfp);
+                       logger("%smax=%f", sep, o->maxfp);
                logger("\n");
        } else if (!o->posval[0].ival) {
                if (!o->minval && !o->maxval)
@@ -127,7 +134,7 @@ static void show_option_help(const struct fio_option *o, int is_err)
                "deprecated",
                "unsupported",
        };
-       size_t (*logger)(const char *format, ...);
+       ssize_t (*logger)(const char *format, ...);
 
        if (is_err)
                logger = log_err;
@@ -433,7 +440,7 @@ void strip_blank_end(char *p)
        *(s + 1) = '\0';
 }
 
-static int check_range_bytes(const char *str, long *val, void *data)
+static int check_range_bytes(const char *str, long long *val, void *data)
 {
        long long __val;
 
@@ -502,7 +509,8 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
        int il=0, *ilp;
        fio_fp64_t *flp;
        long long ull, *ullp;
-       long ul1, ul2;
+       long ul2;
+       long long ull1, ull2;
        double uf;
        char **cp = NULL;
        int ret = 0, is_time = 0;
@@ -520,6 +528,7 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
 
        switch (o->type) {
        case FIO_OPT_STR:
+       case FIO_OPT_STR_ULL:
        case FIO_OPT_STR_MULTI: {
                fio_opt_str_fn *fn = o->cb;
 
@@ -535,7 +544,11 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
                                break;
                        if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
                                ret = 0;
-                               if (o->off1)
+                               if (!o->off1)
+                                       continue;
+                               if (o->type == FIO_OPT_STR_ULL)
+                                       val_store(ullp, vp->oval, o->off1, vp->orval, data, o);
+                               else
                                        val_store(ilp, vp->oval, o->off1, vp->orval, data, o);
                                continue;
                        }
@@ -549,6 +562,8 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
        }
        case FIO_OPT_STR_VAL_TIME:
                is_time = 1;
+               /* fall through */
+       case FIO_OPT_ULL:
        case FIO_OPT_INT:
        case FIO_OPT_STR_VAL: {
                fio_opt_str_val_fn *fn = o->cb;
@@ -579,7 +594,7 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
 
                if (o->maxval && ull > o->maxval) {
                        log_err("max value out of range: %llu"
-                                       " (%u max)\n", ull, o->maxval);
+                                       " (%llu max)\n", ull, o->maxval);
                        return 1;
                }
                if (o->minval && ull < o->minval) {
@@ -631,6 +646,27 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
                                                        val_store(ilp, ull, o->off3, 0, data, o);
                                        }
                                }
+                       } else if (o->type == FIO_OPT_ULL) {
+                               if (first)
+                                       val_store(ullp, ull, o->off1, 0, data, o);
+                               if (curr == 1) {
+                                       if (o->off2)
+                                               val_store(ullp, ull, o->off2, 0, data, o);
+                               }
+                               if (curr == 2) {
+                                       if (o->off3)
+                                               val_store(ullp, ull, o->off3, 0, data, o);
+                               }
+                               if (!more) {
+                                       if (curr < 1) {
+                                               if (o->off2)
+                                                       val_store(ullp, ull, o->off2, 0, data, o);
+                                       }
+                                       if (curr < 2) {
+                                               if (o->off3)
+                                                       val_store(ullp, ull, o->off3, 0, data, o);
+                                       }
+                               }
                        } else {
                                if (first)
                                        val_store(ullp, ull, o->off1, 0, data, o);
@@ -785,43 +821,43 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
                p1 = tmp;
 
                ret = 1;
-               if (!check_range_bytes(p1, &ul1, data) &&
-                   !check_range_bytes(p2, &ul2, data)) {
+               if (!check_range_bytes(p1, &ull1, data) &&
+                       !check_range_bytes(p2, &ull2, data)) {
                        ret = 0;
-                       if (ul1 > ul2) {
-                               unsigned long foo = ul1;
+                       if (ull1 > ull2) {
+                               unsigned long long foo = ull1;
 
-                               ul1 = ul2;
-                               ul2 = foo;
+                               ull1 = ull2;
+                               ull2 = foo;
                        }
 
                        if (first) {
-                               val_store(ilp, ul1, o->off1, 0, data, o);
-                               val_store(ilp, ul2, o->off2, 0, data, o);
+                               val_store(ullp, ull1, o->off1, 0, data, o);
+                               val_store(ullp, ull2, o->off2, 0, data, o);
                        }
                        if (curr == 1) {
                                if (o->off3 && o->off4) {
-                                       val_store(ilp, ul1, o->off3, 0, data, o);
-                                       val_store(ilp, ul2, o->off4, 0, data, o);
+                                       val_store(ullp, ull1, o->off3, 0, data, o);
+                                       val_store(ullp, ull2, o->off4, 0, data, o);
                                }
                        }
                        if (curr == 2) {
                                if (o->off5 && o->off6) {
-                                       val_store(ilp, ul1, o->off5, 0, data, o);
-                                       val_store(ilp, ul2, o->off6, 0, data, o);
+                                       val_store(ullp, ull1, o->off5, 0, data, o);
+                                       val_store(ullp, ull2, o->off6, 0, data, o);
                                }
                        }
                        if (!more) {
                                if (curr < 1) {
                                        if (o->off3 && o->off4) {
-                                               val_store(ilp, ul1, o->off3, 0, data, o);
-                                               val_store(ilp, ul2, o->off4, 0, data, o);
+                                               val_store(ullp, ull1, o->off3, 0, data, o);
+                                               val_store(ullp, ull2, o->off4, 0, data, o);
                                        }
                                }
                                if (curr < 2) {
                                        if (o->off5 && o->off6) {
-                                               val_store(ilp, ul1, o->off5, 0, data, o);
-                                               val_store(ilp, ul2, o->off6, 0, data, o);
+                                               val_store(ullp, ull1, o->off5, 0, data, o);
+                                               val_store(ullp, ull2, o->off6, 0, data, o);
                                        }
                                }
                        }
@@ -846,7 +882,7 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
                        break;
 
                if (o->maxval && il > (int) o->maxval) {
-                       log_err("max value out of range: %d (%d max)\n",
+                       log_err("max value out of range: %d (%llu max)\n",
                                                                il, o->maxval);
                        return 1;
                }
@@ -872,8 +908,10 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
                break;
        }
        case FIO_OPT_DEPRECATED:
-               log_info("Option %s is deprecated\n", o->name);
                ret = 1;
+               /* fall through */
+       case FIO_OPT_SOFT_DEPRECATED:
+               log_info("Option %s is deprecated\n", o->name);
                break;
        default:
                log_err("Bad option type %u\n", o->type);
@@ -921,6 +959,7 @@ static int handle_option(const struct fio_option *o, const char *__ptr,
                if (ptr &&
                    (o->type != FIO_OPT_STR_STORE) &&
                    (o->type != FIO_OPT_STR) &&
+                   (o->type != FIO_OPT_STR_ULL) &&
                    (o->type != FIO_OPT_FLOAT_LIST)) {
                        ptr2 = strchr(ptr, ',');
                        if (ptr2 && *(ptr2 + 1) == '\0')
@@ -1181,8 +1220,6 @@ static void __print_option(const struct fio_option *o,
 
        if (!o)
                return;
-       if (!org)
-               org = o;
 
        p = name;
        depth = level;
@@ -1233,7 +1270,8 @@ int show_cmd_help(const struct fio_option *options, const char *name)
        for (o = &options[0]; o->name; o++) {
                int match = 0;
 
-               if (o->type == FIO_OPT_DEPRECATED)
+               if (o->type == FIO_OPT_DEPRECATED ||
+                   o->type == FIO_OPT_SOFT_DEPRECATED)
                        continue;
                if (!exec_profile && o->prof_name)
                        continue;
@@ -1307,7 +1345,8 @@ void fill_default_options(void *data, const struct fio_option *options)
 
 static void option_init(struct fio_option *o)
 {
-       if (o->type == FIO_OPT_DEPRECATED || o->type == FIO_OPT_UNSUPPORTED)
+       if (o->type == FIO_OPT_DEPRECATED || o->type == FIO_OPT_UNSUPPORTED ||
+           o->type == FIO_OPT_SOFT_DEPRECATED)
                return;
        if (o->name && !o->lname)
                log_err("Option %s: missing long option name\n", o->name);
@@ -1319,6 +1358,10 @@ static void option_init(struct fio_option *o)
                if (!o->maxval)
                        o->maxval = UINT_MAX;
        }
+       if (o->type == FIO_OPT_ULL) {
+               if (!o->maxval)
+                       o->maxval = ULLONG_MAX;
+       }
        if (o->type == FIO_OPT_STR_SET && o->def && !o->no_warn_def) {
                log_err("Option %s: string set option with"
                                " default will always be true\n", o->name);
@@ -1330,9 +1373,6 @@ static void option_init(struct fio_option *o)
                o->category = FIO_OPT_C_GENERAL;
                o->group = FIO_OPT_G_INVALID;
        }
-       if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
-           o->type == FIO_OPT_STR_MULTI)
-               return;
 }
 
 /*