Only apply verify interval to meta verifier, which uses it

[fio.git] / init.c

diff --git a/init.c b/init.c
index 9163e475eb6b844fe3ba8d04bfcf61a3a12b7f42..b97c802b27c2e727423c9c3d30e8592ceb8317ff 100644 (file)
--- a/init.c
+++ b/init.c
@@ -21,7 +21,7 @@
 #include "verify.h"
 #include "profile.h"
 
-static char fio_version_string[] = "fio 1.37";
+static char fio_version_string[] = "fio 1.39";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -360,9 +360,11 @@ static int fixup_options(struct thread_data *td)
 
        if (o->verify != VERIFY_NONE) {
                o->refill_buffers = 1;
-               if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
-                   !o->verify_interval)
-                       o->verify_interval = o->min_bs[DDIR_WRITE];
+               if (o->verify == VERIFY_META) {
+                       if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
+                           !o->verify_interval)
+                               o->verify_interval = o->min_bs[DDIR_WRITE];
+               }
        }
 
        if (o->pre_read) {
@@ -776,6 +778,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                        break;
                }
 
+               name[strlen(name) - 1] = '\0';
+
                if (skip_this_section(name)) {
                        inside_skip = 1;
                        continue;
@@ -784,8 +788,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
                global = !strncmp(name, "global", 6);
 
-               name[strlen(name) - 1] = '\0';
-
                if (dump_cmdline) {
                        if (first_sect)
                                log_info("fio ");
@@ -881,9 +883,6 @@ static int fill_def_thread(void)
        fio_fill_default_options(&def_thread);
 
        def_thread.o.timeout = def_timeout;
-       def_thread.o.write_bw_log = write_bw_log;
-       def_thread.o.write_lat_log = write_lat_log;
-
        return 0;
 }
 
@@ -975,7 +974,8 @@ static void usage(const char *name)
        printf("\t--section=name\tOnly run specified section in job file\n");
        printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
                " (def 1024)\n");
-       printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>\n");
+       printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
+       printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
 }
 
 #ifdef FIO_INC_DEBUG
@@ -1076,7 +1076,7 @@ static int parse_cmd_line(int argc, char *argv[])
                case 'l':
                        write_lat_log = 1;
                        break;
-               case 'w':
+               case 'b':
                        write_bw_log = 1;
                        break;
                case 'o':