[PATCH] Allow leading , in multi setting parameter

Allow only setting of the write end of the sizes by having an empty
text for the read side - example, use bs=,8k to just set the write
side and leave the read side with the default value.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/HOWTO b/HOWTO
index 1e1f4097f54218e8c9d70e9479aecc9bf62c635d..1176d2287f815439c680a38249a104682fcae64a 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -224,7 +224,9 @@ bs=siint    The block size used for the io units. Defaults to 4k. Values
                after a comma, it will apply to writes only. In other words,
                the format is either bs=read_and_write or bs=read,write.
                bs=4k,8k will thus use 4k blocks for reads, and 8k blocks
                after a comma, it will apply to writes only. In other words,
                the format is either bs=read_and_write or bs=read,write.
                bs=4k,8k will thus use 4k blocks for reads, and 8k blocks

-               for writes.
+               for writes. If you only wish to set the write size, you
+               can do so by passing an empty read size - bs=,8k will set
+               8k for writes and leave the read default value.

 
 bsrange=irange Instead of giving a single block size, specify a range
                and fio will mix the issued io block sizes. The issued
 
 bsrange=irange Instead of giving a single block size, specify a range
                and fio will mix the issued io block sizes. The issued

diff --git a/parse.c b/parse.c
index 12f769798b778102dc7175edcc35e20b7ecd7187..7a37868ac65df28bfbf7e124c0ff71892a90d32f 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -64,6 +64,7 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
                *val *= get_mult_bytes(str[len - 1]);
        else
                *val *= get_mult_time(str[len - 1]);
                *val *= get_mult_bytes(str[len - 1]);
        else
                *val *= get_mult_time(str[len - 1]);

+

        return 0;
 }
 
        return 0;
 }
 


@@ -99,6 +100,9 @@ static int check_range_bytes(const char *str, unsigned long *val)
 {
        char suffix;
 
 {
        char suffix;
 

+       if (!strlen(str))
+               return 1;
+

        if (sscanf(str, "%lu%c", val, &suffix) == 2) {
                *val *= get_mult_bytes(suffix);
                return 0;
        if (sscanf(str, "%lu%c", val, &suffix) == 2) {
                *val *= get_mult_bytes(suffix);
                return 0;


@@ -112,6 +116,8 @@ static int check_range_bytes(const char *str, unsigned long *val)
 
 static int check_int(const char *p, unsigned int *val)
 {
 
 static int check_int(const char *p, unsigned int *val)
 {

+       if (!strlen(p))
+               return 1;

        if (sscanf(p, "%u", val) == 1)
                return 0;
 
        if (sscanf(p, "%u", val) == 1)
                return 0;
 


@@ -140,7 +146,7 @@ static struct fio_option *find_option(struct fio_option *options,
        } while (0)
 
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        } while (0)
 
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,

-                          int first)
+                          int first, int more)

 {
        unsigned int il, *ilp;
        unsigned long long ull, *ullp;
 {
        unsigned int il, *ilp;
        unsigned long long ull, *ullp;


@@ -178,12 +184,12 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        if (o->type == FIO_OPT_STR_VAL_INT) {
                                if (first)
                                        val_store(ilp, ull, o->off1, data);
                        if (o->type == FIO_OPT_STR_VAL_INT) {
                                if (first)
                                        val_store(ilp, ull, o->off1, data);

-                               if (o->off2)
+                               if (!more && o->off2)

                                        val_store(ilp, ull, o->off2, data);
                        } else {
                                if (first)
                                        val_store(ullp, ull, o->off1, data);
                                        val_store(ilp, ull, o->off2, data);
                        } else {
                                if (first)
                                        val_store(ullp, ull, o->off1, data);

-                               if (o->off2)
+                               if (!more && o->off2)

                                        val_store(ullp, ull, o->off2, data);
                        }
                }
                                        val_store(ullp, ull, o->off2, data);
                        }
                }


@@ -223,7 +229,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                val_store(ilp, ul1, o->off1, data);
                                val_store(ilp, ul2, o->off2, data);
                        }
                                val_store(ilp, ul1, o->off1, data);
                                val_store(ilp, ul2, o->off2, data);
                        }

-                       if (o->off3 && o->off4) {
+                       if (!more && o->off3 && o->off4) {

                                val_store(ilp, ul1, o->off3, data);
                                val_store(ilp, ul2, o->off4, data);
                        }
                                val_store(ilp, ul1, o->off3, data);
                                val_store(ilp, ul2, o->off4, data);
                        }


@@ -246,7 +252,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                else {
                        if (first)
                                val_store(ilp, il, o->off1, data);
                else {
                        if (first)
                                val_store(ilp, il, o->off1, data);

-                       if (o->off2)
+                       if (!more && o->off2)

                                val_store(ilp, il, o->off2, data);
                }
                break;
                                val_store(ilp, il, o->off2, data);
                }
                break;


@@ -259,7 +265,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                else {
                        if (first)
                                val_store(ilp, 1, o->off1, data);
                else {
                        if (first)
                                val_store(ilp, 1, o->off1, data);

-                       if (o->off2)
+                       if (!more && o->off2)

                                val_store(ilp, 1, o->off2, data);
                }
                break;
                                val_store(ilp, 1, o->off2, data);
                }
                break;


@@ -275,21 +281,29 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 static int handle_option(struct fio_option *o, const char *ptr, void *data)
 {
        const char *ptr2;
 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;
+       int r1, r2;

 
        /*
 
        /*

-        * See if we have a second set of parameters, hidden after a comma
+        * See if we have a second set of parameters, hidden after a comma.
+        * Do this before parsing the first round, to check if we should
+        * copy set 1 options to set 2.

         */
        ptr2 = strchr(ptr, ',');
         */
        ptr2 = strchr(ptr, ',');

+
+       /*
+        * Don't return early if parsing the first option fails - if
+        * we are doing multiple arguments, we can allow the first one
+        * being empty.
+        */
+       r1 = __handle_option(o, ptr, data, 1, !!ptr2);
+

        if (!ptr2)
        if (!ptr2)

-               return 0;
+               return r1;

 
        ptr2++;
 
        ptr2++;

-       return __handle_option(o, ptr2, data, 0);
+       r2 = __handle_option(o, ptr2, data, 0, 0);
+
+       return r1 && r2;

 }
 
 int parse_cmd_option(const char *opt, const char *val,
 }
 
 int parse_cmd_option(const char *opt, const char *val,