Fio 1.18.1

[fio.git] / init.c

diff --git a/init.c b/init.c
index 7fd38ad8e0c433491b9dcffb79376bc931f66471..1d3ee40b29ea2376027b8485bc49d229dd0befd3 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.1";
 
 #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,6 +776,7 @@ static void usage(const char *name)
        printf("\t          \tMay be \"always\", \"never\" or \"auto\"\n");
 }
 
+#ifdef FIO_INC_DEBUG
 struct debug_level debug_levels[] = {
        { .name = "process",    .shift = FD_PROCESS, },
        { .name = "file",       .shift = FD_FILE, },
@@ -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[])
 {