Make kb_base apply to parser k/m/g etc values

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 1071d4031693449fe165fc1852edad4596ee9d91..0bf28a5bd72463d574560d828859669b9b0122c2 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -14,6 +14,7 @@
 #include "debug.h"
 
 static struct fio_option *fio_options;
+extern unsigned int fio_kb_base;
 
 static int vp_cmp(const void *p1, const void *p2)
 {
@@ -41,12 +42,15 @@ static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
        qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
 }
 
-static void show_option_range(struct fio_option *o)
+static void show_option_range(struct fio_option *o, FILE *out)
 {
        if (!o->minval && !o->maxval)
                return;
 
-       printf("%20s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+       fprintf(out, "%20s: min=%d", "range", o->minval);
+       if (o->maxval)
+               fprintf(out, ", max=%d", o->maxval);
+       fprintf(out, "\n");
 }
 
 static void show_option_values(struct fio_option *o)
@@ -70,6 +74,28 @@ static void show_option_values(struct fio_option *o)
                printf("\n");
 }
 
+static void show_option_help(struct fio_option *o, FILE *out)
+{
+       const char *typehelp[] = {
+               "string (opt=bla)",
+               "string with possible k/m/g postfix (opt=4k)",
+               "string with time postfix (opt=10s)",
+               "string (opt=bla)",
+               "string with dual range (opt=1k-4k,4k-8k)",
+               "integer value (opt=100)",
+               "boolean value (opt=1)",
+               "no argument (opt)",
+       };
+
+       if (o->alias)
+               fprintf(out, "%20s: %s\n", "alias", o->alias);
+
+       fprintf(out, "%20s: %s\n", "type", typehelp[o->type]);
+       fprintf(out, "%20s: %s\n", "default", o->def ? o->def : "no default");
+       show_option_range(o, stdout);
+       show_option_values(o);
+}
+
 static unsigned long get_mult_time(char c)
 {
        switch (c) {
@@ -87,24 +113,32 @@ static unsigned long get_mult_time(char c)
        }
 }
 
-static unsigned long get_mult_bytes(char c)
+static unsigned long long get_mult_bytes(char c)
 {
+       unsigned long long ret = 1;
+
        switch (c) {
-       case 'k':
-       case 'K':
-               return 1024;
-       case 'm':
-       case 'M':
-               return 1024 * 1024;
+       default:
+               break;
+       case 'p':
+       case 'P':
+               ret *= (unsigned long long) fio_kb_base;
+       case 't':
+       case 'T':
+               ret *= (unsigned long long) fio_kb_base;
        case 'g':
        case 'G':
-               return 1024 * 1024 * 1024;
-       case 'e':
-       case 'E':
-               return 1024 * 1024 * 1024 * 1024UL;
-       default:
-               return 1;
+               ret *= (unsigned long long) fio_kb_base;
+       case 'm':
+       case 'M':
+               ret *= (unsigned long long) fio_kb_base;
+       case 'k':
+       case 'K':
+               ret *= (unsigned long long) fio_kb_base;
+               break;
        }
+
+       return ret;
 }
 
 /*
@@ -425,6 +459,18 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                ret = 1;
        }
 
+       if (ret)
+               return ret;
+
+       if (o->verify) {
+               ret = o->verify(o, data);
+               if (ret) {
+                       fprintf(stderr,"Correct format for offending option\n");
+                       fprintf(stderr, "%20s: %s\n", o->name, o->help);
+                       show_option_help(o, stderr);
+               }
+       }
+
        return ret;
 }
 
@@ -659,29 +705,6 @@ static int string_distance(const char *s1, const char *s2)
        return i;
 }
 
-static void show_option_help(struct fio_option *o)
-{
-       const char *typehelp[] = {
-               "string (opt=bla)",
-               "string with possible k/m/g postfix (opt=4k)",
-               "string with range and postfix (opt=1k-4k)",
-               "string with time postfix (opt=10s)",
-               "string (opt=bla)",
-               "string with dual range (opt=1k-4k,4k-8k)",
-               "integer value (opt=100)",
-               "boolean value (opt=1)",
-               "no argument (opt)",
-       };
-
-       if (o->alias)
-               printf("%20s: %s\n", "alias", o->alias);
-
-       printf("%20s: %s\n", "type", typehelp[o->type]);
-       printf("%20s: %s\n", "default", o->def ? o->def : "no default");
-       show_option_range(o);
-       show_option_values(o);
-}
-
 static struct fio_option *find_child(struct fio_option *options,
                                     struct fio_option *o)
 {
@@ -786,7 +809,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
                if (!match)
                        continue;
 
-               show_option_help(o);
+               show_option_help(o, stdout);
        }
 
        if (found)
@@ -796,7 +819,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
        if (closest) {
                printf(" - showing closest match\n");
                printf("%20s: %s\n", closest->name, closest->help);
-               show_option_help(closest);
+               show_option_help(closest, stdout);
        } else
                printf("\n");