Add ETA output control and interactivity check

[fio.git] / init.c

diff --git a/init.c b/init.c
index 0151c9bd4b2979626e17c592c76938c9e2b68b35..84cb2d261251062a50cf4a1a6c875e4cd87edb97 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.17.1";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -30,11 +30,13 @@ struct thread_data *threads = NULL;
 
 int exitall_on_terminate = 0;
 int terse_output = 0;
+int eta_print;
 unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
 
 int write_bw_log = 0;
+int read_only = 0;
 
 static int def_timeout = 0;
 static int write_lat_log = 0;
@@ -89,7 +91,17 @@ static struct option long_options[FIO_NR_OPTIONS] = {
        {
                .name           = "showcmd",
                .has_arg        = no_argument,
-               .val            = 's'
+               .val            = 's',
+       },
+       {
+               .name           = "readonly",
+               .has_arg        = no_argument,
+               .val            = 'r',
+       },
+       {
+               .name           = "eta",
+               .has_arg        = required_argument,
+               .val            = 'e',
        },
        {
                .name           = NULL,
@@ -180,6 +192,11 @@ static int fixup_options(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
 
+       if (read_only && td_write(td)) {
+               log_err("fio: job <%s> has write bit set, but fio is in read-only mode\n", td->o.name);
+               return 1;
+       }
+       
        if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
                o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
 
@@ -222,9 +239,6 @@ static int fixup_options(struct thread_data *td)
        if (!o->file_size_high)
                o->file_size_high = o->file_size_low;
 
-       if (td_read(td) && !td_rw(td))
-               o->verify = 0;
-
        if (o->norandommap && o->verify != VERIFY_NONE) {
                log_err("fio: norandommap given, verify disabled\n");
                o->verify = VERIFY_NONE;
@@ -274,6 +288,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 +446,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 +569,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) {
@@ -551,8 +578,12 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
        }
 
        string = malloc(4096);
-       name = malloc(256);
-       memset(name, 0, 256);
+
+       /*
+        * it's really 256 + small bit, 280 should suffice
+        */
+       name = malloc(280);
+       memset(name, 0, 280);
 
        stonewall = stonewall_flag;
        do {
@@ -566,8 +597,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                if (is_empty_or_comment(p))
                        continue;
                if (sscanf(p, "[%255s]", name) != 1) {
-                       log_err("fio: option <%s> outside of job section\n", p);
-                       continue;
+                       log_err("fio: option <%s> outside of [] job section\n", p);
+                       break;
                }
 
                global = !strncmp(name, "global", 6);
@@ -575,9 +606,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 +673,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 +684,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;
 }
 
@@ -722,6 +748,8 @@ static void usage(void)
        printf("\t--help\t\tPrint this page\n");
        printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
        printf("\t--showcmd\tTurn a job file into command line options\n");
+       printf("\t--eta=when\tWhen ETA estimate should be printed\n");
+       printf("\t          \tMay be \"always\", \"never\" or \"auto\"\n");
 }
 
 static int parse_cmd_line(int argc, char *argv[])
@@ -759,9 +787,18 @@ static int parse_cmd_line(int argc, char *argv[])
                case 's':
                        dump_cmdline = 1;
                        break;
+               case 'r':
+                       read_only = 1;
+                       break;
                case 'v':
                        printf("%s\n", fio_version_string);
                        exit(0);
+               case 'e':
+                       if (!strcmp("always", optarg))
+                               eta_print = FIO_ETA_ALWAYS;
+                       else if (!strcmp("never", optarg))
+                               eta_print = FIO_ETA_NEVER;
+                       break;
                case FIO_GETOPT_JOB: {
                        const char *opt = long_options[lidx].name;
                        char *val = optarg;
@@ -775,7 +812,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)