Add 'sequential' file_service_type

[fio.git] / options.c

diff --git a/options.c b/options.c
index fd8ec93516148f829ecd8a98bad7b1285fb8b116..cec7bb79d2422b19f79df258b784c0ab033fbc4b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -247,8 +247,15 @@ static int str_cpumask_cb(void *data, unsigned int *val)
        struct thread_data *td = data;
        unsigned int i;
        long max_cpu;
+       int ret;
+
+       ret = fio_cpuset_init(&td->o.cpumask);
+       if (ret < 0) {
+               log_err("fio: cpuset_init failed\n");
+               td_verror(td, ret, "fio_cpuset_init");
+               return 1;
+       }
 
-       CPU_ZERO(&td->o.cpumask);
        max_cpu = sysconf(_SC_NPROCESSORS_ONLN);
 
        for (i = 0; i < sizeof(int) * 8; i++) {
@@ -259,7 +266,7 @@ static int str_cpumask_cb(void *data, unsigned int *val)
                                return 1;
                        }
                        dprint(FD_PARSE, "set cpu allowed %d\n", i);
-                       CPU_SET(i, &td->o.cpumask);
+                       fio_cpu_set(&td->o.cpumask, i);
                }
        }
 
@@ -274,7 +281,12 @@ static int str_cpus_allowed_cb(void *data, const char *input)
        long max_cpu;
        int ret = 0;
 
-       CPU_ZERO(&td->o.cpumask);
+       ret = fio_cpuset_init(&td->o.cpumask);
+       if (ret < 0) {
+               log_err("fio: cpuset_init failed\n");
+               td_verror(td, ret, "fio_cpuset_init");
+               return 1;
+       }
 
        p = str = strdup(input);
 
@@ -303,9 +315,9 @@ static int str_cpus_allowed_cb(void *data, const char *input)
                if (icpu2 == -1)
                        icpu2 = icpu;
                while (icpu <= icpu2) {
-                       if (icpu >= CPU_SETSIZE) {
+                       if (icpu >= FIO_MAX_CPUS) {
                                log_err("fio: your OS only supports up to"
-                                       " %d CPUs\n", (int) CPU_SETSIZE);
+                                       " %d CPUs\n", (int) FIO_MAX_CPUS);
                                ret = 1;
                                break;
                        }
@@ -317,7 +329,7 @@ static int str_cpus_allowed_cb(void *data, const char *input)
                        }
        
                        dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
-                       CPU_SET(atoi(cpu), &td->o.cpumask);
+                       fio_cpu_set(&td->o.cpumask, icpu);
                        icpu++;
                }
                if (ret)
@@ -718,7 +730,7 @@ static struct fio_option options[] = {
                .alias  = "iodepth_batch_submit",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_batch),
-               .help   = "Number of IO to submit in one go",
+               .help   = "Number of IO buffers to submit in one go",
                .parent = "iodepth",
                .minval = 1,
                .def    = "1",
@@ -727,7 +739,7 @@ static struct fio_option options[] = {
                .name   = "iodepth_batch_complete",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_batch_complete),
-               .help   = "Number of IO to retrieve in one go",
+               .help   = "Number of IO buffers to retrieve in one go",
                .parent = "iodepth",
                .minval = 0,
                .def    = "1",
@@ -859,6 +871,10 @@ static struct fio_option options[] = {
                            .oval = FIO_FSERVICE_RR,
                            .help = "Round robin select files",
                          },
+                         { .ival = "sequential",
+                           .oval = FIO_FSERVICE_SEQ,
+                           .help = "Finish one file before moving to the next",
+                         },
                },
                .parent = "nrfiles",
        },