init.c: Fix non-regular-file booboo

[fio.git] / init.c

diff --git a/init.c b/init.c
index ba33a5e3264303f198087730ae9f6b0a9bb12566..624d2842d69b2e576487357d9d6f44e4443f650c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -30,6 +30,7 @@ static int str_prioclass_cb(void *, unsigned int *);
 #endif
 static int str_exitall_cb(void);
 static int str_cpumask_cb(void *, unsigned int *);
+static int str_fst_cb(void *, const char *);
 
 #define __stringify_1(x)       #x
 #define __stringify(x)         __stringify_1(x)
@@ -190,6 +191,7 @@ static struct fio_option options[] = {
        {
                .name   = "file_service_type",
                .type   = FIO_OPT_STR,
+               .cb     = str_fst_cb,
                .off1   = td_var_offset(file_service_type),
                .help   = "How to select which file to service next",
                .def    = "roundrobin",
@@ -621,6 +623,8 @@ FILE *f_err = NULL;
 static int write_lat_log = 0;
 int write_bw_log = 0;
 
+static int prev_group_jobs;
+
 FILE *get_f_out()
 {
        return f_out;
@@ -802,6 +806,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        int numjobs, i;
        struct fio_file *f;
        const char *engine;
+       int fn_given;
 
        /*
         * the def_thread is just for options, it's not a real job
@@ -816,11 +821,20 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                return 1;
        }
 
+       if (td->use_thread)
+               nr_thread++;
+       else
+               nr_process++;
+
        if (td->odirect)
                td->io_ops->flags |= FIO_RAWIO;
 
+       fn_given = (long) td->filename;
+       if (!td->filename)
+               td->filename = strdup(jobname);
+
        td->filetype = FIO_TYPE_FILE;
-       if (td->filename && !lstat(td->filename, &sb)) {
+       if (!lstat(td->filename, &sb)) {
                if (S_ISBLK(sb.st_mode))
                        td->filetype = FIO_TYPE_BD;
                else if (S_ISCHR(sb.st_mode))
@@ -829,12 +843,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
        fixup_options(td);
 
-       if (td->filename)
+       if (fn_given)
                td->nr_uniq_files = 1;
        else
                td->nr_uniq_files = td->open_files;
 
-       if (td->filetype == FIO_TYPE_FILE || td->filename) {
+       if (td->filetype == FIO_TYPE_FILE) {
                char tmp[PATH_MAX];
                int len = 0;
 
@@ -857,10 +871,10 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                        memset(f, 0, sizeof(*f));
                        f->fd = -1;
 
-                       if (td->filename)
+                       if (fn_given)
                                sprintf(tmp + len, "%s", td->filename);
                        else
-                               sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
+                               sprintf(tmp + len, "%s.%d.%d", td->filename, td->thread_number, i);
                        f->file_name = strdup(tmp);
                }
        } else {
@@ -870,7 +884,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
                memset(f, 0, sizeof(*f));
                f->fd = -1;
-               f->file_name = strdup(jobname);
+               f->file_name = strdup(td->filename);
        }
 
        for_each_file(td, f, i) {
@@ -884,10 +898,13 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
        td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
 
-       if (td->stonewall && td->thread_number > 1)
+       if ((td->stonewall || td->numjobs > 1) && prev_group_jobs) {
+               prev_group_jobs = 0;
                groupid++;
+       }
 
        td->groupid = groupid;
+       prev_group_jobs++;
 
        if (setup_rate(td))
                goto err;
@@ -943,6 +960,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                if (add_job(td_new, jobname, job_add_num))
                        goto err;
        }
+
+       if (td->numjobs > 1) {
+               groupid++;
+               prev_group_jobs = 0;
+       }
+
        return 0;
 err:
        put_job(td);
@@ -994,6 +1017,10 @@ int init_random_state(struct thread_data *td)
                        blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
                        num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
                        f->file_map = malloc(num_maps * sizeof(long));
+                       if (!f->file_map) {
+                               log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+                               return 1;
+                       }
                        f->num_maps = num_maps;
                        memset(f->file_map, 0, num_maps * sizeof(long));
                }
@@ -1036,7 +1063,7 @@ static int is_empty_or_comment(char *line)
 /*
  * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
  */
-static char *get_mmap_file(const char *str)
+static char *get_opt_postfix(const char *str)
 {
        char *p = strstr(str, ":");
 
@@ -1054,7 +1081,7 @@ static int str_mem_cb(void *data, const char *mem)
        struct thread_data *td = data;
 
        if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
-               td->mmapfile = get_mmap_file(mem);
+               td->mmapfile = get_opt_postfix(mem);
                if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
                        log_err("fio: mmaphuge:/path/to/file\n");
                        return 1;
@@ -1102,6 +1129,18 @@ static int str_cpumask_cb(void *data, unsigned int *val)
        return 0;
 }
 
+static int str_fst_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+       char *nr = get_opt_postfix(str);
+
+       td->file_service_nr = 1;
+       if (nr)
+               td->file_service_nr = atoi(nr);
+
+       return 0;
+}
+
 /*
  * This is our [ini] type file parser.
  */