Fio 1.50-rc4

[fio.git] / init.c

diff --git a/init.c b/init.c
index dcb01934701e1a47d1ca9e9d084989c66eda1c77..6666f372171d8f188a8fa3493b05feadf5eef9c2 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.50-rc3";
+static char fio_version_string[] = "fio 1.50-rc4";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -55,6 +55,8 @@ unsigned long fio_debug = 0;
 unsigned int fio_debug_jobno = -1;
 unsigned int *fio_debug_jobp = NULL;
 
+static char cmd_optstr[256];
+
 /*
  * Command line options. These will contain the above, plus a few
  * extra that only pertain to fio itself and not jobs.
@@ -246,7 +248,7 @@ static int fixed_block_size(struct thread_options *o)
 static int fixup_options(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
-       int ret;
+       int ret = 0;
 
 #ifndef FIO_HAVE_PSHARED_MUTEX
        if (!o->use_thread) {
@@ -379,7 +381,7 @@ static int fixup_options(struct thread_data *td)
                                "pre-populated the file\n");
                        ret = warnings_fatal;
                }
-               if (td_write(td) && o->numjobs > 1) {
+               if (td_write(td) && o->do_verify && o->numjobs > 1) {
                        log_info("Multiple writers may overwrite blocks that "
                                "belong to other jobs. This can cause "
                                "verification failures.\n");
@@ -1037,8 +1039,6 @@ static int set_debug(const char *string)
        int i;
 
        if (!strcmp(string, "?") || !strcmp(string, "help")) {
-               int i;
-
                log_info("fio: dumping debug options:");
                for (i = 0; debug_levels[i].name; i++) {
                        dl = &debug_levels[i];
@@ -1093,12 +1093,32 @@ static int set_debug(const char *string)
 }
 #endif
 
+static void fio_options_fill_optstring(void)
+{
+       char *ostr = cmd_optstr;
+       int i, c;
+
+       c = i = 0;
+       while (l_opts[i].name) {
+               ostr[c++] = l_opts[i].val;
+               if (l_opts[i].has_arg == required_argument)
+                       ostr[c++] = ':';
+               else if (l_opts[i].has_arg == optional_argument) {
+                       ostr[c++] = ':';
+                       ostr[c++] = ':';
+               }
+               i++;
+       }
+       ostr[c] = '\0';
+}
+
 static int parse_cmd_line(int argc, char *argv[])
 {
        struct thread_data *td = NULL;
        int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
+       char *ostr = cmd_optstr;
 
-       while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
+       while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
                switch (c) {
                case 'a':
                        smalloc_pool_size = atoi(optarg);
@@ -1231,6 +1251,7 @@ int parse_options(int argc, char *argv[])
 
        log_info("%s\n", fio_version_string);
 
+       fio_options_fill_optstring();
        fio_options_dup_and_init(l_opts);
 
        if (setup_thread_area())