Cleanup parse_cmd_line()
[fio.git] / init.c
diff --git a/init.c b/init.c
index 4762a815cadc0da4e97c175eaa4573da30138b9f..d559a7ac94abb46d7a4b2bdd0cbed363503b80f2 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.17.3";
+static char fio_version_string[] = "fio 1.18.1";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -34,6 +34,7 @@ int eta_print;
 unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
+char *job_section = NULL;
 
 int write_bw_log = 0;
 int read_only = 0;
@@ -43,6 +44,8 @@ static int write_lat_log = 0;
 
 static int prev_group_jobs;
 
+unsigned long fio_debug = 0;
+
 /*
  * Command line options. These will contain the above, plus a few
  * extra that only pertain to fio itself and not jobs.
@@ -103,6 +106,16 @@ static struct option long_options[FIO_NR_OPTIONS] = {
                .has_arg        = required_argument,
                .val            = 'e',
        },
+       {
+               .name           = "debug",
+               .has_arg        = required_argument,
+               .val            = 'd',
+       },
+       {
+               .name           = "section",
+               .has_arg        = required_argument,
+               .val            = 'x',
+       },
        {
                .name           = NULL,
        },
@@ -206,13 +219,6 @@ static int fixup_options(struct thread_data *td)
                o->write_iolog_file = NULL;
        }
 
-       if (td->io_ops->flags & FIO_SYNCIO)
-               o->iodepth = 1;
-       else {
-               if (!o->iodepth)
-                       o->iodepth = o->open_files;
-       }
-
        /*
         * only really works for sequential io for now, and with 1 file
         */
@@ -295,6 +301,10 @@ static int fixup_options(struct thread_data *td)
 
        if (o->fill_device && !o->size)
                o->size = ULONG_LONG_MAX;
+       
+       if (td_rw(td) && td->o.verify != VERIFY_NONE)
+               log_info("fio: mixed read/write workload with verify. May not "
+                "work as expected, unless you pre-populated the file\n");
 
        return 0;
 }
@@ -544,6 +554,16 @@ err:
        return -1;
 }
 
+static int skip_this_section(const char *name)
+{
+       if (!job_section)
+               return 0;
+       if (!strncmp(name, "global", 6))
+               return 0;
+
+       return strncmp(job_section, name, strlen(job_section));
+}
+
 static int is_empty_or_comment(char *line)
 {
        unsigned int i;
@@ -573,6 +593,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
        int ret = 0, stonewall;
        int first_sect = 1;
        int skip_fgets = 0;
+       int inside_skip = 0;
 
        if (!strcmp(file, "-"))
                f = stdin;
@@ -611,10 +632,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                if (is_empty_or_comment(p))
                        continue;
                if (sscanf(p, "[%255s]", name) != 1) {
+                       if (inside_skip)
+                               continue;
                        log_err("fio: option <%s> outside of [] job section\n", p);
                        break;
                }
 
+               if (skip_this_section(name)) {
+                       inside_skip = 1;
+                       continue;
+               } else
+                       inside_skip = 0;
+
                global = !strncmp(name, "global", 6);
 
                name[strlen(name) - 1] = '\0';
@@ -758,6 +787,7 @@ static void usage(const char *name)
 {
        printf("%s\n", fio_version_string);
        printf("%s [options] [job options] <job file(s)>\n", name);
+       printf("\t--debug=options\tEnable debug logging\n");
        printf("\t--output\tWrite output to file\n");
        printf("\t--timeout\tRuntime in seconds\n");
        printf("\t--latency-log\tGenerate per-job latency logs\n");
@@ -769,12 +799,71 @@ static void usage(const char *name)
        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");
+       printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n");
+       printf("\t--section=name\tOnly run specified section in job file\n");
 }
 
+#ifdef FIO_INC_DEBUG
+struct debug_level debug_levels[] = {
+       { .name = "process",    .shift = FD_PROCESS, },
+       { .name = "file",       .shift = FD_FILE, },
+       { .name = "io",         .shift = FD_IO, },
+       { .name = "mem",        .shift = FD_MEM, },
+       { .name = "blktrace",   .shift = FD_BLKTRACE },
+       { .name = "verify",     .shift = FD_VERIFY },
+       { },
+};
+
+static void set_debug(const char *string)
+{
+       struct debug_level *dl;
+       char *p = (char *) string;
+       char *opt;
+       int i;
+
+       if (!strcmp(string, "?") || !strcmp(string, "help")) {
+               int i;
+
+               log_info("fio: dumping debug options:");
+               for (i = 0; debug_levels[i].name; i++) {
+                       dl = &debug_levels[i];
+                       log_info("%s,", dl->name);
+               }
+               log_info("all\n");
+               return;
+       } else if (!strcmp(string, "all")) {
+               fio_debug = ~0UL;
+               return;
+       }
+
+       while ((opt = strsep(&p, ",")) != NULL) {
+               int found = 0;
+
+               for (i = 0; debug_levels[i].name; i++) {
+                       dl = &debug_levels[i];
+                       if (!strncmp(opt, dl->name, strlen(opt))) {
+                               log_info("fio: set debug option %s\n", opt);
+                               found = 1;
+                               fio_debug |= (1UL << dl->shift);
+                               break;
+                       }
+               }
+
+               if (!found)
+                       log_err("fio: debug mask %s not found\n", opt);
+       }
+}
+#else
+static void set_debug(const char *string)
+{
+       log_err("fio: debug tracing not included in build\n");
+}
+#endif
+
 static int parse_cmd_line(int argc, char *argv[])
 {
        struct thread_data *td = NULL;
-       int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
+       int c, ini_idx = 0, lidx, ret = 0, bad_options = 0;
 
        while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
                switch (c) {
@@ -818,6 +907,19 @@ static int parse_cmd_line(int argc, char *argv[])
                        else if (!strcmp("never", optarg))
                                eta_print = FIO_ETA_NEVER;
                        break;
+               case 'd':
+                       set_debug(optarg);
+                       break;
+               case 'x':
+                       if (!strcmp(optarg, "global")) {
+                               log_err("fio: can't use global as only section\n");
+                               bad_options++;
+                               break;
+                       }
+                       if (job_section)
+                               free(job_section);
+                       job_section = strdup(optarg);
+                       break;
                case FIO_GETOPT_JOB: {
                        const char *opt = long_options[lidx].name;
                        char *val = optarg;
@@ -831,35 +933,37 @@ static int parse_cmd_line(int argc, char *argv[])
                                td = NULL;
                        }
                        if (!td) {
+                               int is_section = !strncmp(opt, "name", 4);
                                int global = 0;
 
-                               if (strncmp(opt, "name", 4) ||
-                                   !strncmp(val, "global", 6))
+                               if (!is_section || !strncmp(val, "global", 6))
                                        global = 1;
 
+                               if (is_section && skip_this_section(val))
+                                       continue;
+
                                td = get_new_job(global, &def_thread);
                                if (!td)
                                        return 0;
                        }
 
                        ret = fio_cmd_option_parse(td, opt, val);
-                       if (ret)
-                               dont_add_job = 1;
                        break;
                }
                default:
+                       bad_options++;
                        break;
                }
        }
 
+       if (bad_options)
+               exit(1);
+
        if (td) {
-               if (dont_add_job)
-                       put_job(td);
-               else {
+               if (!ret)
                        ret = add_job(td, td->o.name ?: "fio", 0);
-                       if (ret)
-                               put_job(td);
-               }
+               if (ret)
+                       put_job(td);
        }
 
        while (optind < argc) {
@@ -872,7 +976,6 @@ static int parse_cmd_line(int argc, char *argv[])
        return ini_idx;
 }
 
-
 int parse_options(int argc, char *argv[])
 {
        int job_files, i;