Ensure that we honor aio_read/write() returning EAGAIN

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index e9eb73852dbccbeb630b415db7220678054553ad..1e6a5224fb4ada8897f2e6e8b901eb5c2c82d256 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -168,19 +168,20 @@ static unsigned long long __get_mult_bytes(const char *p, void *data)
 
 static unsigned long long get_mult_bytes(const char *str, int len, void *data)
 {
-       const char *p;
+       const char *p = str;
 
        if (len < 2)
                return __get_mult_bytes(str, data);
 
-       /*
-        * if the last char is 'b' or 'B', the user likely used
-        * "1gb" instead of just "1g". If the second to last is also
-        * a letter, adjust.
-        */
-       p = str + len - 1;
-       while (isalpha(*(p - 1)))
-               p--;
+        /*
+         * Go forward until we hit a non-digit
+         */
+       while ((p - str) <= len) {
+               if (!isdigit(*p))
+                       break;
+               p++;
+       }
+
        if (!isalpha(*p))
                p = NULL;
 
@@ -309,7 +310,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        long long ull, *ullp;
        long ul1, ul2;
        char **cp;
-       int ret = 0;
+       int ret = 0, is_time = 0;
 
        dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
                                                        o->type, ptr);
@@ -357,14 +358,17 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        ret = fn(data, ptr);
                break;
        }
-       case FIO_OPT_STR_VAL_TIME: {
-               fio_opt_str_val_fn *fn;
-
-               ret = check_str_time(ptr, &ull);
+       case FIO_OPT_STR_VAL_TIME:
+               is_time = 1;
        case FIO_OPT_INT:
-       case FIO_OPT_STR_VAL:
+       case FIO_OPT_STR_VAL: {
+               fio_opt_str_val_fn *fn = o->cb;
+
+               if (is_time)
+                       ret = check_str_time(ptr, &ull);
+               else
+                       ret = check_str_bytes(ptr, &ull, data);
 
-               ret = check_str_bytes(ptr, &ull, data);
                if (ret)
                        break;
 
@@ -379,7 +383,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        return 1;
                }
 
-               fn = o->cb;
                if (fn)
                        ret = fn(data, &ull);
                else {