[PATCH] Remove redundant -f job option
[fio.git] / init.c
diff --git a/init.c b/init.c
index 8c6b2e1e336c7a572902f346336969157da3231b..ced9d859aa853ddf9fb04c2a6395aa418e5f166d 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1,3 +1,7 @@
+/*
+ * This file contains the ini and command liner parser. It will create
+ * and initialize the specified jobs.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -12,6 +16,9 @@
 
 #include "fio.h"
 
+/*
+ * The default options
+ */
 #define DEF_BS                 (4096)
 #define DEF_TIMEOUT            (0)
 #define DEF_RATE_CYCLE         (1000)
 #define DEF_RWMIX_READ         (50)
 #define DEF_NICE               (0)
 
-static char fio_version_string[] = "fio 1.4";
+static int def_timeout = DEF_TIMEOUT;
+
+static char fio_version_string[] = "fio 1.5";
 
-static int repeatable = DEF_RAND_REPEAT;
-static char *ini_file;
+static char **ini_file;
 static int max_jobs = MAX_JOBS;
 
 struct thread_data def_thread;
@@ -53,8 +61,14 @@ int rate_quit = 0;
 int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 0;
+int terse_output = 0;
 unsigned long long mlock_size = 0;
+FILE *f_out = NULL;
+FILE *f_err = NULL;
 
+/*
+ * Return a free job structure.
+ */
 static struct thread_data *get_new_job(int global, struct thread_data *parent)
 {
        struct thread_data *td;
@@ -65,51 +79,11 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
                return NULL;
 
        td = &threads[thread_number++];
-       if (parent)
-               *td = *parent;
-       else
-               memset(td, 0, sizeof(*td));
+       *td = *parent;
+       td->name[0] = '\0';
 
        td->fd = -1;
        td->thread_number = thread_number;
-
-       td->ddir = parent->ddir;
-       td->ioprio = parent->ioprio;
-       td->sequential = parent->sequential;
-       td->bs = parent->bs;
-       td->min_bs = parent->min_bs;
-       td->max_bs = parent->max_bs;
-       td->odirect = parent->odirect;
-       td->thinktime = parent->thinktime;
-       td->fsync_blocks = parent->fsync_blocks;
-       td->start_delay = parent->start_delay;
-       td->timeout = parent->timeout;
-       td->io_engine = parent->io_engine;
-       td->create_file = parent->create_file;
-       td->overwrite = parent->overwrite;
-       td->invalidate_cache = parent->invalidate_cache;
-       td->file_size = parent->file_size;
-       td->file_offset = parent->file_offset;
-       td->zone_size = parent->zone_size;
-       td->zone_skip = parent->zone_skip;
-       td->rate = parent->rate;
-       td->ratemin = parent->ratemin;
-       td->ratecycle = parent->ratecycle;
-       td->iodepth = parent->iodepth;
-       td->sync_io = parent->sync_io;
-       td->mem_type = parent->mem_type;
-       td->bw_avg_time = parent->bw_avg_time;
-       td->create_serialize = parent->create_serialize;
-       td->create_fsync = parent->create_fsync;
-       td->loops = parent->loops;
-       td->verify = parent->verify;
-       td->stonewall = parent->stonewall;
-       td->numjobs = parent->numjobs;
-       td->use_thread = parent->use_thread;
-       td->do_disk_util = parent->do_disk_util;
-       memcpy(&td->cpumask, &parent->cpumask, sizeof(td->cpumask));
-       strcpy(td->io_engine_name, parent->io_engine_name);
-
        return td;
 }
 
@@ -119,6 +93,11 @@ static void put_job(struct thread_data *td)
        thread_number--;
 }
 
+/*
+ * Adds a job to the list of things todo. Sanitizes the various options
+ * to make sure we don't have conflicts, and initializes various
+ * members of td.
+ */
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
        char *ddir_str[] = { "read", "write", "randread", "randwrite",
@@ -128,13 +107,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 #ifndef FIO_HAVE_LIBAIO
        if (td->io_engine == FIO_LIBAIO) {
-               fprintf(stderr, "Linux libaio not available\n");
+               log_err("Linux libaio not available\n");
                return 1;
        }
 #endif
 #ifndef FIO_HAVE_POSIXAIO
        if (td->io_engine == FIO_POSIXAIO) {
-               fprintf(stderr, "posix aio not available\n");
+               log_err("posix aio not available\n");
                return 1;
        }
 #endif
@@ -158,6 +137,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (td->zone_size && !td->sequential)
                td->zone_size = 0;
 
+       /*
+        * Reads can do overwrites, we always need to pre-create the file
+        */
+       if (td_read(td) || td_rw(td))
+               td->overwrite = 1;
+
        td->filetype = FIO_TYPE_FILE;
        if (!stat(jobname, &sb)) {
                if (S_ISBLK(sb.st_mode))
@@ -167,12 +152,15 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        }
 
        if (td->filetype == FIO_TYPE_FILE) {
+               char tmp[PATH_MAX];
+
                if (td->directory && td->directory[0] != '\0')
-                       sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
+                       sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
                else
-                       sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
+                       sprintf(tmp, "%s.%d", jobname, td->thread_number);
+               td->file_name = strdup(tmp);
        } else
-               strncpy(td->file_name, jobname, sizeof(td->file_name) - 1);
+               td->file_name = strdup(jobname);
 
        fio_sem_init(&td->mutex, 0);
 
@@ -207,10 +195,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
        ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 
-       if (!job_add_num)
-               printf("%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
-       else if (job_add_num == 1)
-               printf("...\n");
+       if (!terse_output) {
+               if (!job_add_num)
+                       fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+               else if (job_add_num == 1)
+                       fprintf(f_out, "...\n");
+       }
 
        /*
         * recurse add identical jobs, clear numjobs and stonewall options
@@ -225,7 +215,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
                td_new->numjobs = 1;
                td_new->stonewall = 0;
-               td_new->jobnum = numjobs;
                job_add_num = numjobs - 1;
 
                if (add_job(td_new, jobname, job_add_num))
@@ -237,6 +226,10 @@ err:
        return -1;
 }
 
+/*
+ * Initialize the various random states we need (random io, block size ranges,
+ * read/write mix, etc).
+ */
 int init_random_state(struct thread_data *td)
 {
        unsigned long seeds[4];
@@ -263,7 +256,7 @@ int init_random_state(struct thread_data *td)
        if (td->sequential)
                return 0;
 
-       if (repeatable)
+       if (td->rand_repeatable)
                seeds[3] = DEF_RANDSEED;
 
        blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
@@ -290,7 +283,24 @@ static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
 #endif
 }
 
-static unsigned long get_mult(char c)
+static unsigned long get_mult_time(char c)
+{
+       switch (c) {
+               case 'm':
+               case 'M':
+                       return 60;
+               case 'h':
+               case 'H':
+                       return 60 * 60;
+               case 'd':
+               case 'D':
+                       return 24 * 60 * 60;
+               default:
+                       return 1;
+       }
+}
+
+static unsigned long get_mult_bytes(char c)
 {
        switch (c) {
                case 'k':
@@ -310,7 +320,7 @@ static unsigned long get_mult(char c)
 /*
  * convert string after '=' into decimal value, noting any size suffix
  */
-static int str_cnv(char *p, unsigned long long *val)
+static int str_to_decimal(char *p, unsigned long long *val, int kilo)
 {
        char *str;
        int len;
@@ -326,16 +336,27 @@ static int str_cnv(char *p, unsigned long long *val)
        if (*val == ULONG_MAX && errno == ERANGE)
                return 1;
 
-       *val *= get_mult(str[len - 1]);
+       if (kilo)
+               *val *= get_mult_bytes(str[len - 1]);
+       else
+               *val *= get_mult_time(str[len - 1]);
        return 0;
 }
 
-static int check_strcnv(char *p, char *name, unsigned long long *val)
+static int check_str_bytes(char *p, char *name, unsigned long long *val)
 {
        if (strncmp(p, name, strlen(name) - 1))
                return 1;
 
-       return str_cnv(p, val);
+       return str_to_decimal(p, val, 1);
+}
+
+static int check_str_time(char *p, char *name, unsigned long long *val)
+{
+       if (strncmp(p, name, strlen(name) - 1))
+               return 1;
+
+       return str_to_decimal(p, val, 0);
 }
 
 static void strip_blank_front(char **p)
@@ -400,12 +421,12 @@ static int check_strstore(char *p, char *name, char *dest)
        return 0;
 }
 
-static int __check_range(char *str, unsigned long *val)
+static int __check_range_bytes(char *str, unsigned long *val)
 {
        char suffix;
 
        if (sscanf(str, "%lu%c", val, &suffix) == 2) {
-               *val *= get_mult(suffix);
+               *val *= get_mult_bytes(suffix);
                return 0;
        }
 
@@ -415,7 +436,8 @@ static int __check_range(char *str, unsigned long *val)
        return 1;
 }
 
-static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
+static int check_range_bytes(char *p, char *name, unsigned long *s,
+                            unsigned long *e)
 {
        char option[128];
        char *str, *p1, *p2;
@@ -451,7 +473,7 @@ static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
        p2 = p + 1;
        *p = '\0';
 
-       if (!__check_range(p1, s) && !__check_range(p2, e))
+       if (!__check_range_bytes(p1, s) && !__check_range_bytes(p2, e))
                return 0;
 
        return 1;
@@ -529,7 +551,7 @@ static int str_rw_cb(struct thread_data *td, char *mem)
                return 0;
        }
 
-       fprintf(stderr, "fio: data direction: read, write, randread, randwrite, rw, randrw\n");
+       log_err("fio: data direction: read, write, randread, randwrite, rw, randrw\n");
        return 1;
 }
 
@@ -546,7 +568,7 @@ static int str_verify_cb(struct thread_data *td, char *mem)
                return 0;
        }
 
-       fprintf(stderr, "fio: verify types: md5, crc32\n");
+       log_err("fio: verify types: md5, crc32\n");
        return 1;
 }
 
@@ -563,7 +585,7 @@ static int str_mem_cb(struct thread_data *td, char *mem)
                return 0;
        }
 
-       fprintf(stderr, "fio: mem type: malloc, shm, mmap\n");
+       log_err("fio: mem type: malloc, shm, mmap\n");
        return 1;
 }
 
@@ -596,14 +618,14 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
                return 0;
        }
 
-       fprintf(stderr, "fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
+       log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
        return 1;
 }
 
 /*
  * This is our [ini] type file parser.
  */
-int parse_jobs_ini(char *file)
+int parse_jobs_ini(char *file, int stonewall_flag)
 {
        unsigned int prioclass, prio, cpu, global, il;
        unsigned long long ull;
@@ -613,7 +635,7 @@ int parse_jobs_ini(char *file)
        fpos_t off;
        FILE *f;
        char *p;
-       int ret = 0;
+       int ret = 0, stonewall;
 
        f = fopen(file, "r");
        if (!f) {
@@ -625,6 +647,7 @@ int parse_jobs_ini(char *file)
        name = malloc(256);
        tmpbuf = malloc(4096);
 
+       stonewall = stonewall_flag;
        while ((p = fgets(string, 4096, f)) != NULL) {
                if (ret)
                        break;
@@ -643,6 +666,14 @@ int parse_jobs_ini(char *file)
                        break;
                }
 
+               /*
+                * Seperate multiple job files by a stonewall
+                */
+               if (!global && stonewall) {
+                       td->stonewall = stonewall;
+                       stonewall = 0;
+               }
+
                fgetpos(f, &off);
                while ((p = fgets(string, 4096, f)) != NULL) {
                        if (is_empty_or_comment(p))
@@ -654,7 +685,7 @@ int parse_jobs_ini(char *file)
 
                        if (!check_int(p, "prio", &prio)) {
 #ifndef FIO_HAVE_IOPRIO
-                               fprintf(stderr, "io priorities not available\n");
+                               log_err("io priorities not available\n");
                                ret = 1;
                                break;
 #endif
@@ -664,7 +695,7 @@ int parse_jobs_ini(char *file)
                        }
                        if (!check_int(p, "prioclass", &prioclass)) {
 #ifndef FIO_HAVE_IOPRIO
-                               fprintf(stderr, "io priorities not available\n");
+                               log_err("io priorities not available\n");
                                ret = 1;
                                break;
 #else
@@ -673,7 +704,13 @@ int parse_jobs_ini(char *file)
                                continue;
 #endif
                        }
-                       if (!check_int(p, "direct", &td->odirect)) {
+                       if (!check_int(p, "direct", &il)) {
+                               td->odirect = il;
+                               fgetpos(f, &off);
+                               continue;
+                       }
+                       if (!check_int(p, "rand_repeatable", &il)) {
+                               td->rand_repeatable = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -695,7 +732,7 @@ int parse_jobs_ini(char *file)
                        }
                        if (!check_int(p, "cpumask", &cpu)) {
 #ifndef FIO_HAVE_CPU_AFFINITY
-                               fprintf(stderr, "cpu affinity not available\n");
+                               log_err("cpu affinity not available\n");
                                ret = 1;
                                break;
 #endif
@@ -712,11 +749,13 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "timeout", &td->timeout)) {
+                       if (!check_str_time(p, "timeout", &ull)) {
+                               td->timeout = ul1;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "invalidate",&td->invalidate_cache)) {
+                       if (!check_int(p, "invalidate", &il)) {
+                               td->invalidate_cache = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -724,7 +763,8 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "sync", &td->sync_io)) {
+                       if (!check_int(p, "sync", &il)) {
+                               td->sync_io = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -732,15 +772,18 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "create_serialize", &td->create_serialize)) {
+                       if (!check_int(p, "create_serialize", &il)) {
+                               td->create_serialize = il;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "create_fsync", &td->create_fsync)) {
+                       if (!check_int(p, "create_fsync", &il)) {
+                               td->create_fsync = il;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "end_fsync", &td->end_fsync)) {
+                       if (!check_int(p, "end_fsync", &il)) {
+                               td->end_fsync = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -752,7 +795,8 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_int(p, "overwrite", &td->overwrite)) {
+                       if (!check_int(p, "overwrite", &il)) {
+                               td->overwrite = il;
                                fgetpos(f, &off);
                                continue;
                        }
@@ -778,7 +822,7 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_range(p, "bsrange", &ul1, &ul2)) {
+                       if (!check_range_bytes(p, "bsrange", &ul1, &ul2)) {
                                if (ul1 > ul2) {
                                        td->max_bs = ul1;
                                        td->min_bs = ul2;
@@ -789,28 +833,28 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_strcnv(p, "bs", &ull)) {
+                       if (!check_str_bytes(p, "bs", &ull)) {
                                td->bs = ull;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_strcnv(p, "size", &td->file_size)) {
+                       if (!check_str_bytes(p, "size", &td->file_size)) {
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_strcnv(p, "offset", &td->file_offset)) {
+                       if (!check_str_bytes(p, "offset", &td->file_offset)) {
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_strcnv(p, "zonesize", &td->zone_size)) {
+                       if (!check_str_bytes(p, "zonesize", &td->zone_size)) {
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_strcnv(p, "zoneskip", &td->zone_skip)) {
+                       if (!check_str_bytes(p, "zoneskip", &td->zone_skip)) {
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!check_strcnv(p, "lockmem", &mlock_size)) {
+                       if (!check_str_bytes(p, "lockmem", &mlock_size)) {
                                fgetpos(f, &off);
                                continue;
                        }
@@ -861,16 +905,22 @@ int parse_jobs_ini(char *file)
                                continue;
                        }
                        if (!check_strstore(p, "iolog", tmpbuf)) {
+                               if (td->write_iolog) {
+                                       log_err("fio: read iolog overrides given write_iolog\n");
+                                       free(td->iolog_file);
+                                       td->write_iolog = 0;
+                               }
                                td->iolog_file = strdup(tmpbuf);
                                td->read_iolog = 1;
-                               td->write_iolog = 0;
                                fgetpos(f, &off);
                                continue;
                        }
-                       if (!td->read_iolog &&
-                           !check_strstore(p, "write_iolog", tmpbuf)) {
-                               td->iolog_file = strdup(tmpbuf);
-                               td->write_iolog = 1;
+                       if (!check_strstore(p, "write_iolog", tmpbuf)) {
+                               if (!td->read_iolog) {
+                                       td->iolog_file = strdup(tmpbuf);
+                                       td->write_iolog = 1;
+                               } else
+                                       log_err("fio: read iolog overrides given write_iolog\n");
                                fgetpos(f, &off);
                                continue;
                        }
@@ -886,7 +936,7 @@ int parse_jobs_ini(char *file)
                        }
                        if (!check_strstore(p, "ioscheduler", tmpbuf)) {
 #ifndef FIO_HAVE_IOSCHED_SWITCH
-                               fprintf(stderr, "io scheduler switching not available\n");
+                               log_err("io scheduler switching not available\n");
                                ret = 1;
                                break;
 #else
@@ -942,7 +992,7 @@ static int fill_def_thread(void)
        def_thread.odirect = DEF_ODIRECT;
        def_thread.ratecycle = DEF_RATE_CYCLE;
        def_thread.sequential = DEF_SEQUENTIAL;
-       def_thread.timeout = DEF_TIMEOUT;
+       def_thread.timeout = def_timeout;
        def_thread.create_file = DEF_CREATE;
        def_thread.overwrite = DEF_OVERWRITE;
        def_thread.invalidate_cache = DEF_INVALIDATE;
@@ -959,6 +1009,7 @@ static int fill_def_thread(void)
        def_thread.rwmixcycle = DEF_RWMIX_CYCLE;
        def_thread.rwmixread = DEF_RWMIX_READ;
        def_thread.nice = DEF_NICE;
+       def_thread.rand_repeatable = DEF_RAND_REPEAT;
 #ifdef FIO_HAVE_DISK_UTIL
        def_thread.do_disk_util = 1;
 #endif
@@ -969,54 +1020,45 @@ static int fill_def_thread(void)
 static void usage(char *name)
 {
        printf("%s\n", fio_version_string);
-       printf("\t-s IO is sequential\n");
-       printf("\t-b Block size in KiB for each IO\n");
+       printf("\t-o Write output to file\n");
        printf("\t-t Runtime in seconds\n");
-       printf("\t-R Exit all threads on failure to meet rate goal\n");
-       printf("\t-o Use O_DIRECT\n");
        printf("\t-l Generate per-job latency logs\n");
        printf("\t-w Generate per-job bandwidth logs\n");
+       printf("\t-m Minimal (terse) output\n");
        printf("\t-f Job file (Required)\n");
        printf("\t-v Print version info and exit\n");
 }
 
-static void parse_cmd_line(int argc, char *argv[])
+static int parse_cmd_line(int argc, char *argv[])
 {
-       int c;
+       int c, idx = 1, ini_idx = 0;
 
-       while ((c = getopt(argc, argv, "s:b:t:r:R:o:f:lwvh")) != EOF) {
+       while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) {
                switch (c) {
-                       case 's':
-                               def_thread.sequential = !!atoi(optarg);
-                               break;
-                       case 'b':
-                               def_thread.bs = atoi(optarg);
-                               def_thread.bs <<= 10;
-                               if (!def_thread.bs) {
-                                       printf("bad block size\n");
-                                       def_thread.bs = DEF_BS;
-                               }
-                               break;
                        case 't':
-                               def_thread.timeout = atoi(optarg);
-                               break;
-                       case 'r':
-                               repeatable = !!atoi(optarg);
-                               break;
-                       case 'R':
-                               rate_quit = !!atoi(optarg);
-                               break;
-                       case 'o':
-                               def_thread.odirect = !!atoi(optarg);
-                               break;
-                       case 'f':
-                               ini_file = strdup(optarg);
+                               def_timeout = atoi(optarg);
+                               idx++;
                                break;
                        case 'l':
                                write_lat_log = 1;
+                               idx++;
                                break;
                        case 'w':
                                write_bw_log = 1;
+                               idx++;
+                               break;
+                       case 'o':
+                               f_out = fopen(optarg, "w+");
+                               if (!f_out) {
+                                       perror("fopen output");
+                                       exit(1);
+                               }
+                               f_err = f_out;
+                               idx++;
+                               break;
+                       case 'm':
+                               terse_output = 1;
+                               idx++;
                                break;
                        case 'h':
                                usage(argv[0]);
@@ -1027,8 +1069,19 @@ static void parse_cmd_line(int argc, char *argv[])
                }
        }
 
-       if (!ini_file && argc > 1 && argv[argc - 1][0] != '-')
-               ini_file = strdup(argv[argc - 1]);
+       while (idx < argc) {
+               ini_idx++;
+               ini_file = realloc(ini_file, ini_idx * sizeof(char *));
+               ini_file[ini_idx - 1] = strdup(argv[idx]);
+               idx++;
+       }
+               
+       if (!f_out) {
+               f_out = stdout;
+               f_err = stderr;
+       }
+
+       return ini_idx;
 }
 
 static void free_shm(void)
@@ -1036,12 +1089,17 @@ static void free_shm(void)
        struct shmid_ds sbuf;
 
        if (threads) {
-               shmdt(threads);
+               shmdt((void *) threads);
                threads = NULL;
                shmctl(shm_id, IPC_RMID, &sbuf);
        }
 }
 
+/*
+ * The thread area is shared between the main process and the job
+ * threads/processes. So setup a shared memory segment that will hold
+ * all the job info.
+ */
 static int setup_thread_area(void)
 {
        /*
@@ -1049,9 +1107,9 @@ static int setup_thread_area(void)
         * we get a failure that looks like too large a shm segment
         */
        do {
-               int s = max_jobs * sizeof(struct thread_data);
+               size_t size = max_jobs * sizeof(struct thread_data);
 
-               shm_id = shmget(0, s, IPC_CREAT | 0600);
+               shm_id = shmget(0, size, IPC_CREAT | 0600);
                if (shm_id != -1)
                        break;
                if (errno != EINVAL) {
@@ -1077,21 +1135,28 @@ static int setup_thread_area(void)
 
 int parse_options(int argc, char *argv[])
 {
+       int job_files, i;
+
        if (setup_thread_area())
                return 1;
        if (fill_def_thread())
                return 1;
 
-       parse_cmd_line(argc, argv);
-
-       if (!ini_file) {
-               printf("Need job file\n");
+       job_files = parse_cmd_line(argc, argv);
+       if (!job_files) {
+               log_err("Need job file(s)\n");
                usage(argv[0]);
                return 1;
        }
 
-       if (parse_jobs_ini(ini_file))
-               return 1;
+       for (i = 0; i < job_files; i++) {
+               if (fill_def_thread())
+                       return 1;
+               if (parse_jobs_ini(ini_file[i], i))
+                       return 1;
+               free(ini_file[i]);
+       }
 
+       free(ini_file);
        return 0;
 }