Fio 2.1.6.1

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 544ecb1c53dce5f336faf3294c0acfc75ace53e3..4bfa470d0e285539e7de0d441c4d63aedd0eeb9c 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -11,6 +11,7 @@
 #include "fio.h"
 #include "smalloc.h"
 #include "filehash.h"
+#include "options.h"
 #include "os/os.h"
 #include "hash.h"
 #include "lib/axmap.h"
@@ -21,6 +22,8 @@
 
 static int root_warn;
 
+static FLIST_HEAD(filename_list);
+
 static inline void clear_error(struct thread_data *td)
 {
        td->error = 0;
@@ -206,8 +209,7 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
                did_open = 1;
        }
 
-       old_runstate = td->runstate;
-       td_set_runstate(td, TD_PRE_READING);
+       old_runstate = td_bump_runstate(td, TD_PRE_READING);
 
        bs = td->o.max_bs[DDIR_READ];
        b = malloc(bs);
@@ -231,7 +233,7 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       td_set_runstate(td, old_runstate);
+       td_restore_runstate(td, old_runstate);
 
        if (did_open)
                td->io_ops->close_file(td, f);
@@ -742,8 +744,7 @@ int setup_files(struct thread_data *td)
 
        dprint(FD_FILE, "setup files\n");
 
-       old_state = td->runstate;
-       td_set_runstate(td, TD_SETTING_UP);
+       old_state = td_bump_runstate(td, TD_SETTING_UP);
 
        if (o->read_iolog_file)
                goto done;
@@ -922,12 +923,12 @@ done:
        if (o->create_only)
                td->done = 1;
 
-       td_set_runstate(td, old_state);
+       td_restore_runstate(td, old_state);
        return 0;
 err_offset:
        log_err("%s: you need to specify valid offset=\n", o->name);
 err_out:
-       td_set_runstate(td, old_state);
+       td_restore_runstate(td, old_state);
        return 1;
 }
 
@@ -977,11 +978,12 @@ static int init_rand_distribution(struct thread_data *td)
        if (td->o.random_distribution == FIO_RAND_DIST_RANDOM)
                return 0;
 
-       state = td->runstate;
-       td_set_runstate(td, TD_SETTING_UP);
+       state = td_bump_runstate(td, TD_SETTING_UP);
+
        for_each_file(td, f, i)
                __init_rand_distribution(td, f);
-       td_set_runstate(td, state);
+
+       td_restore_runstate(td, state);
 
        return 1;
 }
@@ -1007,7 +1009,7 @@ int init_random_map(struct thread_data *td)
 
                        seed = td->rand_seeds[FIO_RAND_BLOCK_OFF];
                        
-                       if (!lfsr_init(&f->lfsr, blocks, seed, seed & 0xF))
+                       if (!lfsr_init(&f->lfsr, blocks, seed, 0))
                                continue;
                } else if (!td->o.norandommap) {
                        f->io_axmap = axmap_new(blocks);
@@ -1101,7 +1103,48 @@ static void get_file_type(struct fio_file *f)
        }
 }
 
-int add_file(struct thread_data *td, const char *fname)
+static void set_already_allocated(const char *fname) {
+       struct file_name *fn;
+
+       fn = malloc(sizeof(struct file_name));
+       fn->filename = strdup(fname);
+       flist_add_tail(&fn->list, &filename_list);
+}
+
+static int is_already_allocated(const char *fname)
+{
+       struct flist_head *entry;
+       char *filename;
+
+       if (!flist_empty(&filename_list))
+       {
+               flist_for_each(entry, &filename_list) {
+                       filename = flist_entry(entry, struct file_name, list)->filename;
+
+                       if (strcmp(filename, fname) == 0)
+                               return 1;
+               }
+       }
+
+       return 0;
+}
+
+static void free_already_allocated() {
+       struct flist_head *entry, *tmp;
+       struct file_name *fn;
+
+       if (!flist_empty(&filename_list))
+       {
+               flist_for_each_safe(entry, tmp, &filename_list) {
+                       fn = flist_entry(entry, struct file_name, list);
+                       free(fn->filename);
+                       flist_del(&fn->list);
+                       free(fn);
+               }
+       }
+}
+
+int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
 {
        int cur_files = td->files_index;
        char file_name[PATH_MAX];
@@ -1110,6 +1153,15 @@ int add_file(struct thread_data *td, const char *fname)
 
        dprint(FD_FILE, "add file %s\n", fname);
 
+       if (td->o.directory)
+               len = set_name_idx(file_name, td->o.directory, numjob);
+
+       sprintf(file_name + len, "%s", fname);
+
+       /* clean cloned siblings using existing files */
+       if (numjob && is_already_allocated(file_name))
+               return 0;
+
        f = smalloc(sizeof(*f));
        if (!f) {
                log_err("fio: smalloc OOM\n");
@@ -1149,10 +1201,6 @@ int add_file(struct thread_data *td, const char *fname)
        if (td->io_ops && (td->io_ops->flags & FIO_DISKLESSIO))
                f->real_file_size = -1ULL;
 
-       if (td->o.directory)
-               len = sprintf(file_name, "%s/", td->o.directory);
-
-       sprintf(file_name + len, "%s", fname);
        f->file_name = smalloc_strdup(file_name);
        if (!f->file_name) {
                log_err("fio: smalloc OOM\n");
@@ -1179,6 +1227,18 @@ int add_file(struct thread_data *td, const char *fname)
        if (f->filetype == FIO_TYPE_FILE)
                td->nr_normal_files++;
 
+       set_already_allocated(file_name);
+
+       /*
+        * For adding files after the fact - if openfiles= isn't
+        * given as an option, ensure we allow at least one file open
+        */
+       if (!td->o.open_files)
+               td->o.open_files = 1;
+
+       if (inc)
+               td->o.nr_files++;
+
        dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name,
                                                        cur_files);
 
@@ -1195,7 +1255,7 @@ int add_file_exclusive(struct thread_data *td, const char *fname)
                        return i;
        }
 
-       return add_file(td, fname);
+       return add_file(td, fname, 0, 1);
 }
 
 void get_file(struct fio_file *f)
@@ -1304,8 +1364,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
                }
 
                if (S_ISREG(sb.st_mode)) {
-                       add_file(td, full_path);
-                       td->o.nr_files++;
+                       add_file(td, full_path, 0, 1);
                        continue;
                }
                if (!S_ISDIR(sb.st_mode))
@@ -1421,3 +1480,8 @@ int fio_files_done(struct thread_data *td)
 
        return 1;
 }
+
+/* free memory used in initialization phase only */
+void filesetup_mem_free() {
+       free_already_allocated();
+}