syslet: typo

[fio.git] / init.c

diff --git a/init.c b/init.c
index 1dec2bbd324209acf04b72e1430c4d1d5d9db2cb..956ff5f0a48b5a98699b43704788697cdf5f0487 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,
@@ -330,6 +336,13 @@ static struct fio_option options[] = {
                .help   = "Idle time between IO buffers (usec)",
                .def    = "0",
        },
+       {
+               .name   = "thinktime_spin",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(thinktime_spin),
+               .help   = "Start thinktime by spinning this amount (usec)",
+               .def    = "0",
+       },
        {
                .name   = "thinktime_blocks",
                .type   = FIO_OPT_INT,
@@ -631,6 +644,18 @@ static void fixup_options(struct thread_data *td)
         */
        if (td->filetype == FIO_TYPE_CHAR && td->odirect)
                td->odirect = 0;
+
+       /*
+        * thinktime_spin must be less than thinktime
+        */
+       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;
 }
 
 /*
@@ -739,9 +764,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                
        fio_sem_init(&td->mutex, 0);
 
-       td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
-       td->slat_stat[0].min_val = td->slat_stat[1].min_val = ULONG_MAX;
-       td->bw_stat[0].min_val = td->bw_stat[1].min_val = ULONG_MAX;
+       td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
+       td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
+       td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
 
        if (td->stonewall && td->thread_number > 1)
                groupid++;
@@ -752,11 +777,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                goto err;
 
        if (td->write_lat_log) {
-               setup_log(&td->slat_log);
-               setup_log(&td->clat_log);
+               setup_log(&td->ts.slat_log);
+               setup_log(&td->ts.clat_log);
        }
        if (td->write_bw_log)
-               setup_log(&td->bw_log);
+               setup_log(&td->ts.bw_log);
 
        if (!td->name)
                td->name = strdup(jobname);
@@ -882,6 +907,8 @@ static int is_empty_or_comment(char *line)
        for (i = 0; i < strlen(line); i++) {
                if (line[i] == ';')
                        return 1;
+               if (line[i] == '#')
+                       return 1;
                if (!isspace(line[i]) && !iscntrl(line[i]))
                        return 0;
        }