Dump io_u on timeout

[fio.git] / init.c

diff --git a/init.c b/init.c
index 6dc221ea4eb31ff95e8796d50aeaf4199845a429..c8f27ade76e7f2aafaef4e98320d189c2a26e347 100644 (file)
--- a/init.c
+++ b/init.c
@@ -90,6 +90,12 @@ static struct fio_option options[] = {
                .help   = "Amount of IO buffers to keep in flight",
                .def    = "1",
        },
+       {
+               .name   = "iodepth_low",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(iodepth_low),
+               .help   = "Low water mark for queuing depth",
+       },
        {
                .name   = "size",
                .type   = FIO_OPT_STR_VAL,
@@ -644,6 +650,12 @@ static void fixup_options(struct thread_data *td)
         */
        if (td->thinktime_spin > td->thinktime)
                td->thinktime_spin = td->thinktime;
+
+       /*
+        * The low water mark cannot be bigger than the iodepth
+        */
+       if (td->iodepth_low > td->iodepth || !td->iodepth_low)
+               td->iodepth_low = td->iodepth;
 }
 
 /*
@@ -713,7 +725,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                if (td->directory && td->directory[0] != '\0') {
                        if (lstat(td->directory, &sb) < 0) {
                                log_err("fio: %s is not a directory\n", td->directory);
-                               td_verror(td, errno);
+                               td_verror(td, errno, "lstat");
                                return 1;
                        }
                        if (!S_ISDIR(sb.st_mode)) {
@@ -838,12 +850,12 @@ int init_random_state(struct thread_data *td)
 
        fd = open("/dev/urandom", O_RDONLY);
        if (fd == -1) {
-               td_verror(td, errno);
+               td_verror(td, errno, "open");
                return 1;
        }
 
        if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
-               td_verror(td, EIO);
+               td_verror(td, EIO, "read");
                close(fd);
                return 1;
        }
@@ -1032,7 +1044,7 @@ static int str_ioengine_cb(void *data, const char *str)
        if (td->io_ops)
                return 0;
 
-       log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n");
+       log_err("fio: ioengine= libaio, posixaio, sync, syslet-rw, mmap, sgio, splice, cpu, null\n");
        log_err("fio: or specify path to dynamic ioengine module\n");
        return 1;
 }