Fix cpumask setting/getting on older kernels

[fio.git] / init.c

diff --git a/init.c b/init.c
index 0151c9bd4b2979626e17c592c76938c9e2b68b35..355de88ffa4db9cdc65e6c3d53103fd4618064c4 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.15.1";
+static char fio_version_string[] = "fio 1.16.1";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -274,6 +274,11 @@ static int fixup_options(struct thread_data *td)
                return 1;
        }
 
+       if (!o->timeout && o->time_based) {
+               log_err("fio: time_based requires a runtime/timeout setting\n");
+               o->time_based = 0;
+       }
+
        return 0;
 }
 
@@ -427,6 +432,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (fixup_options(td))
                goto err;
 
+       if (td->io_ops->flags & FIO_DISKLESSIO) {
+               struct fio_file *f;
+
+               for_each_file(td, f, i)
+                       f->real_file_size = -1ULL;
+       }
+
        td->mutex = fio_sem_init(0);
 
        td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
@@ -543,6 +555,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
        FILE *f;
        char *p;
        int ret = 0, stonewall;
+       int first_sect = 1;
 
        f = fopen(file, "r");
        if (!f) {
@@ -575,9 +588,11 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                name[strlen(name) - 1] = '\0';
 
                if (dump_cmdline) {
-                       log_info("fio ");
+                       if (first_sect)
+                               log_info("fio ");
                        if (!global)
                                log_info("--name=%s ", name);
+                       first_sect = 0;
                }
 
                td = get_new_job(global, &def_thread);
@@ -640,10 +655,7 @@ static int fill_def_thread(void)
 {
        memset(&def_thread, 0, sizeof(def_thread));
 
-       if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
-               perror("sched_getaffinity");
-               return 1;
-       }
+       fio_getaffinity(getpid(), &def_thread.o.cpumask);
 
        /*
         * fill default options
@@ -654,10 +666,6 @@ static int fill_def_thread(void)
        def_thread.o.write_bw_log = write_bw_log;
        def_thread.o.write_lat_log = write_lat_log;
 
-#ifdef FIO_HAVE_DISK_UTIL
-       def_thread.o.do_disk_util = 1;
-#endif
-
        return 0;
 }
 
@@ -775,7 +783,11 @@ static int parse_cmd_line(int argc, char *argv[])
                                td = NULL;
                        }
                        if (!td) {
-                               int global = !strncmp(val, "global", 6);
+                               int global = 0;
+
+                               if (strncmp(opt, "name", 4) ||
+                                   !strncmp(val, "global", 6))
+                                       global = 1;
 
                                td = get_new_job(global, &def_thread);
                                if (!td)