Add option to select how to service multiple files

[fio.git] / init.c

diff --git a/init.c b/init.c
index 6dc221ea4eb31ff95e8796d50aeaf4199845a429..01e615f92e90e1f37864e591279f037c8ddba55c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -33,6 +33,7 @@ static int str_prioclass_cb(void *, unsigned int *);
 #endif
 static int str_exitall_cb(void);
 static int str_cpumask_cb(void *, unsigned int *);
+static int str_file_service_cb(void *, const char *);
 
 #define __stringify_1(x)       #x
 #define __stringify(x)         __stringify_1(x)
@@ -90,6 +91,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,
@@ -146,6 +153,14 @@ static struct fio_option options[] = {
                .help   = "Split job workload between this number of files",
                .def    = "1",
        },
+       {
+               .name   = "file_service_type",
+               .type   = FIO_OPT_STR,
+               .cb     = str_file_service_cb,
+               .help   = "How to select which file to service next",
+               .def    = "roundrobin",
+               .posval = { "random", "roundrobin" },
+       },
        {
                .name   = "fsync",
                .type   = FIO_OPT_INT,
@@ -644,6 +659,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 +734,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)) {
@@ -829,7 +850,7 @@ err:
  */
 int init_random_state(struct thread_data *td)
 {
-       unsigned long seeds[4];
+       unsigned long seeds[5];
        int fd, num_maps, blocks, i;
        struct fio_file *f;
 
@@ -838,12 +859,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;
        }
@@ -853,12 +874,13 @@ int init_random_state(struct thread_data *td)
        os_random_seed(seeds[0], &td->bsrange_state);
        os_random_seed(seeds[1], &td->verify_state);
        os_random_seed(seeds[2], &td->rwmix_state);
+       os_random_seed(seeds[3], &td->next_file_state);
 
        if (td->sequential)
                return 0;
 
        if (td->rand_repeatable)
-               seeds[3] = FIO_RANDSEED * td->thread_number;
+               seeds[4] = FIO_RANDSEED * td->thread_number;
 
        if (!td->norandommap) {
                for_each_file(td, f, i) {
@@ -870,7 +892,7 @@ int init_random_state(struct thread_data *td)
                }
        }
 
-       os_random_seed(seeds[3], &td->random_state);
+       os_random_seed(seeds[4], &td->random_state);
        return 0;
 }
 
@@ -1032,7 +1054,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;
 }
@@ -1075,6 +1097,22 @@ static int str_cpumask_cb(void *data, unsigned int *val)
        return 0;
 }
 
+static int str_file_service_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+
+       if (!strncmp(str, "random", 6)) {
+               td->file_service_type = FIO_FSERVICE_RANDOM;
+               return 0;
+       } else if (!strncmp(str, "roundrobin", 10)) {
+               td->file_service_type = FIO_FSERVICE_RR;
+               return 0;
+       }
+
+       log_err("fio: file_service= random, roundrobin\n");
+       return 1;
+}
+
 /*
  * This is our [ini] type file parser.
  */