Verify doesn't really work on mixed read/write workloads, so warn

[fio.git] / init.c

diff --git a/init.c b/init.c
index 3c0af71da10d9639ec864f4296db4f30aa8974d9..64023458d03250e87d4064aef02f21292f149028 100644 (file)
--- a/init.c
+++ b/init.c
@@ -17,7 +17,7 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.17.3";
+static char fio_version_string[] = "fio 1.18";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -213,13 +213,6 @@ static int fixup_options(struct thread_data *td)
                o->write_iolog_file = NULL;
        }
 
-       if (td->io_ops->flags & FIO_SYNCIO)
-               o->iodepth = 1;
-       else {
-               if (!o->iodepth)
-                       o->iodepth = o->open_files;
-       }
-
        /*
         * only really works for sequential io for now, and with 1 file
         */
@@ -302,6 +295,10 @@ static int fixup_options(struct thread_data *td)
 
        if (o->fill_device && !o->size)
                o->size = ULONG_LONG_MAX;
+       
+       if (td_rw(td) && td->o.verify != VERIFY_NONE)
+               log_info("fio: mixed read/write workload with verify. May not "
+                "work as expected, unless you pre-populated the file\n");
 
        return 0;
 }
@@ -779,16 +776,14 @@ static void usage(const char *name)
        printf("\t          \tMay be \"always\", \"never\" or \"auto\"\n");
 }
 
-struct debug_level {
-       const char *name;
-       unsigned long mask;
-};
-
+#ifdef FIO_INC_DEBUG
 struct debug_level debug_levels[] = {
-       { .name = "process", .mask = FD_PROCESS, },
-       { .name = "file", .mask = FD_FILE, },
-       { .name = "io", .mask = FD_IO, },
-       { .name = "mem", .mask = FD_MEM, },
+       { .name = "process",    .shift = FD_PROCESS, },
+       { .name = "file",       .shift = FD_FILE, },
+       { .name = "io",         .shift = FD_IO, },
+       { .name = "mem",        .shift = FD_MEM, },
+       { .name = "blktrace",   .shift = FD_BLKTRACE },
+       { .name = "verify",     .shift = FD_VERIFY },
        { },
 };
 
@@ -807,7 +802,10 @@ static void set_debug(const char *string)
                        dl = &debug_levels[i];
                        log_info("%s,", dl->name);
                }
-               log_info("\n");
+               log_info("all\n");
+               return;
+       } else if (!strcmp(string, "all")) {
+               fio_debug = ~0UL;
                return;
        }
 
@@ -819,7 +817,7 @@ static void set_debug(const char *string)
                        if (!strncmp(opt, dl->name, strlen(opt))) {
                                log_info("fio: set debug option %s\n", opt);
                                found = 1;
-                               fio_debug |= dl->mask;
+                               fio_debug |= (1UL << dl->shift);
                                break;
                        }
                }
@@ -828,6 +826,12 @@ static void set_debug(const char *string)
                        log_err("fio: debug mask %s not found\n", opt);
        }
 }
+#else
+static void set_debug(const char *string)
+{
+       log_err("fio: debug tracing not included in build\n");
+}
+#endif
 
 static int parse_cmd_line(int argc, char *argv[])
 {
@@ -933,7 +937,6 @@ static int parse_cmd_line(int argc, char *argv[])
        return ini_idx;
 }
 
-
 int parse_options(int argc, char *argv[])
 {
        int job_files, i;