Add option for not including the tracing stuff

[fio.git] / init.c

diff --git a/init.c b/init.c
index 45bd92fd8a3ef0fc04fcd95b54f13e60aa28a72d..721978f6626674cdfbb685ff860576c1bb286af6 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.1";
+static char fio_version_string[] = "fio 1.17.3";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -43,6 +43,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 +105,11 @@ static struct option long_options[FIO_NR_OPTIONS] = {
                .has_arg        = required_argument,
                .val            = 'e',
        },
+       {
+               .name           = "debug",
+               .has_arg        = required_argument,
+               .val            = 'd',
+       },
        {
                .name           = NULL,
        },
@@ -293,6 +300,9 @@ static int fixup_options(struct thread_data *td)
                o->time_based = 0;
        }
 
+       if (o->fill_device && !o->size)
+               o->size = ULONG_LONG_MAX;
+
        return 0;
 }
 
@@ -565,11 +575,11 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
        unsigned int global;
        struct thread_data *td;
        char *string, *name;
-       fpos_t off;
        FILE *f;
        char *p;
        int ret = 0, stonewall;
        int first_sect = 1;
+       int skip_fgets = 0;
 
        if (!strcmp(file, "-"))
                f = stdin;
@@ -591,10 +601,17 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
        stonewall = stonewall_flag;
        do {
-               p = fgets(string, 4095, f);
-               if (!p)
-                       break;
+               /*
+                * if skip_fgets is set, we already have loaded a line we
+                * haven't handled.
+                */
+               if (!skip_fgets) {
+                       p = fgets(string, 4095, f);
+                       if (!p)
+                               break;
+               }
 
+               skip_fgets = 0;
                strip_blank_front(&p);
                strip_blank_end(p);
 
@@ -631,20 +648,23 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                        stonewall = 0;
                }
 
-               fgetpos(f, &off);
                while ((p = fgets(string, 4096, f)) != NULL) {
                        if (is_empty_or_comment(p))
                                continue;
 
                        strip_blank_front(&p);
 
-                       if (p[0] == '[')
+                       /*
+                        * new section, break out and make sure we don't
+                        * fgets() a new line at the top.
+                        */
+                       if (p[0] == '[') {
+                               skip_fgets = 1;
                                break;
+                       }
 
                        strip_blank_end(p);
 
-                       fgetpos(f, &off);
-
                        /*
                         * Don't break here, continue parsing options so we
                         * dump all the bad ones. Makes trial/error fixups
@@ -655,10 +675,9 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                                log_info("--%s ", p);
                }
 
-               if (!ret) {
-                       fsetpos(f, &off);
+               if (!ret)
                        ret = add_job(td, name, 0);
-               } else {
+               else {
                        log_err("fio: job %s dropped\n", name);
                        put_job(td);
                }
@@ -737,13 +756,16 @@ static int setup_thread_area(void)
                return 1;
        }
 
+       memset(threads, 0, max_jobs * sizeof(struct thread_data));
        atexit(free_shm);
        return 0;
 }
 
-static void usage(void)
+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");
@@ -757,6 +779,63 @@ static void usage(void)
        printf("\t          \tMay be \"always\", \"never\" or \"auto\"\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;
@@ -785,7 +864,7 @@ static int parse_cmd_line(int argc, char *argv[])
                        terse_output = 1;
                        break;
                case 'h':
-                       usage();
+                       usage(argv[0]);
                        exit(0);
                case 'c':
                        exit(fio_show_option_help(optarg));
@@ -804,6 +883,9 @@ 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 FIO_GETOPT_JOB: {
                        const char *opt = long_options[lidx].name;
                        char *val = optarg;
@@ -858,7 +940,6 @@ static int parse_cmd_line(int argc, char *argv[])
        return ini_idx;
 }
 
-
 int parse_options(int argc, char *argv[])
 {
        int job_files, i;
@@ -891,6 +972,7 @@ int parse_options(int argc, char *argv[])
                        return 0;
 
                log_err("No jobs defined(s)\n");
+               usage(argv[0]);
                return 1;
        }