Merge branch 'master' into gfio
[fio.git] / filesetup.c
index 746b3cda4da05b4717ad0a551c40f907e5323368..76e142af88972748f8ac96df047d7fd68ffd4cee 100644 (file)
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <assert.h>
 #include <dirent.h>
+#include <libgen.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include "fio.h"
 #include "smalloc.h"
 #include "filehash.h"
+#include "os/os.h"
+
+#ifdef FIO_HAVE_LINUX_FALLOCATE
+#include <linux/falloc.h>
+#endif
 
 static int root_warn;
 
+static inline void clear_error(struct thread_data *td)
+{
+       td->error = 0;
+       td->verror[0] = '\0';
+}
+
 /*
  * Leaves f->fd open on success, caller must close
  */
@@ -58,22 +70,59 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
+#ifdef FIO_HAVE_FALLOCATE
+       if (!td->o.fill_device) {
+               switch (td->o.fallocate_mode) {
+               case FIO_FALLOCATE_NONE:
+                       break;
+               case FIO_FALLOCATE_POSIX:
+                       dprint(FD_FILE, "posix_fallocate file %s size %llu\n",
+                                f->file_name, f->real_file_size);
+
+                       r = posix_fallocate(f->fd, 0, f->real_file_size);
+                       if (r > 0) {
+                               log_err("fio: posix_fallocate fails: %s\n",
+                                               strerror(r));
+                       }
+                       break;
+#ifdef FIO_HAVE_LINUX_FALLOCATE
+               case FIO_FALLOCATE_KEEP_SIZE:
+                       dprint(FD_FILE,
+                               "fallocate(FALLOC_FL_KEEP_SIZE) "
+                               "file %s size %llu\n",
+                               f->file_name, f->real_file_size);
+
+                       r = fallocate(f->fd, FALLOC_FL_KEEP_SIZE, 0,
+                                       f->real_file_size);
+                       if (r != 0)
+                               td_verror(td, errno, "fallocate");
+
+                       break;
+#endif /* FIO_HAVE_LINUX_FALLOCATE */
+               default:
+                       log_err("fio: unknown fallocate mode: %d\n",
+                               td->o.fallocate_mode);
+                       assert(0);
+               }
+       }
+#endif /* FIO_HAVE_FALLOCATE */
+
        if (!new_layout)
                goto done;
 
-       dprint(FD_FILE, "truncate file %s, size %llu\n", f->file_name,
+       /*
+        * The size will be -1ULL when fill_device is used, so don't truncate
+        * or fallocate this file, just write it
+        */
+       if (!td->o.fill_device) {
+               dprint(FD_FILE, "truncate file %s, size %llu\n", f->file_name,
                                                        f->real_file_size);
-       if (ftruncate(f->fd, f->real_file_size) == -1) {
-               td_verror(td, errno, "ftruncate");
-               goto err;
+               if (ftruncate(f->fd, f->real_file_size) == -1) {
+                       td_verror(td, errno, "ftruncate");
+                       goto err;
+               }
        }
 
-       dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
-                                                       f->real_file_size);
-       r = posix_fallocate(f->fd, 0, f->real_file_size);
-       if (r < 0)
-               log_err("fio: posix_fallocate fails: %s\n", strerror(-r));
-
        b = malloc(td->o.max_bs[DDIR_WRITE]);
        memset(b, 0, td->o.max_bs[DDIR_WRITE]);
 
@@ -85,13 +134,22 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 
                r = write(f->fd, b, bs);
 
-               if (r == (int) bs) {
-                       left -= bs;
+               if (r > 0) {
+                       left -= r;
                        continue;
                } else {
-                       if (r < 0)
+                       if (r < 0) {
+                               int __e = errno;
+
+                               if (__e == ENOSPC) {
+                                       if (td->o.fill_device)
+                                               break;
+                                       log_info("fio: ENOSPC on laying out "
+                                                "file, stopping\n");
+                                       break;
+                               }
                                td_verror(td, errno, "write");
-                       else
+                       else
                                td_verror(td, EIO, "write");
 
                        break;
@@ -107,6 +165,13 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                        goto err;
                }
        }
+       if (td->o.fill_device && !td_write(td)) {
+               fio_file_clear_size_known(f);
+               if (td_io_get_file_size(td, f))
+                       goto err;
+               if (f->io_size > f->real_file_size)
+                       f->io_size = f->real_file_size;
+       }
 
        free(b);
 done:
@@ -117,14 +182,72 @@ err:
        return 1;
 }
 
+static int pre_read_file(struct thread_data *td, struct fio_file *f)
+{
+       int r, did_open = 0, old_runstate;
+       unsigned long long left;
+       unsigned int bs;
+       char *b;
+
+       if (td->io_ops->flags & FIO_PIPEIO)
+               return 0;
+
+       if (!fio_file_open(f)) {
+               if (td->io_ops->open_file(td, f)) {
+                       log_err("fio: cannot pre-read, failed to open file\n");
+                       return 1;
+               }
+               did_open = 1;
+       }
+
+       old_runstate = td->runstate;
+       td_set_runstate(td, TD_PRE_READING);
+
+       bs = td->o.max_bs[DDIR_READ];
+       b = malloc(bs);
+       memset(b, 0, bs);
+
+       lseek(f->fd, f->file_offset, SEEK_SET);
+       left = f->io_size;
+
+       while (left && !td->terminate) {
+               if (bs > left)
+                       bs = left;
+
+               r = read(f->fd, b, bs);
+
+               if (r == (int) bs) {
+                       left -= bs;
+                       continue;
+               } else {
+                       td_verror(td, EIO, "pre_read");
+                       break;
+               }
+       }
+
+       td_set_runstate(td, old_runstate);
+
+       if (did_open)
+               td->io_ops->close_file(td, f);
+       free(b);
+       return 0;
+}
+
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-       unsigned long long ret, size_d;
-       long r;
+       unsigned long long ret, sized;
+       unsigned long r;
+
+       if (td->o.use_os_rand) {
+               r = os_random_long(&td->file_size_state);
+               sized = td->o.file_size_high - td->o.file_size_low;
+               ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
+       } else {
+               r = __rand(&td->__file_size_state);
+               sized = td->o.file_size_high - td->o.file_size_low;
+               ret = (unsigned long long) ((double) sized * (r / (FRAND_MAX + 1.0)));
+       }
 
-       r = os_random_long(&td->file_size_state);
-       size_d = td->o.file_size_high - td->o.file_size_low;
-       ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
        ret += td->o.file_size_low;
        ret -= (ret % td->o.rw_min_bs);
        return ret;
@@ -134,7 +257,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
        struct stat st;
 
-       if (fstat(f->fd, &st) == -1) {
+       if (stat(f->file_name, &st) == -1) {
                td_verror(td, errno, "fstat");
                return 1;
        }
@@ -145,30 +268,82 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
 static int bdev_size(struct thread_data *td, struct fio_file *f)
 {
-       unsigned long long bytes;
+       unsigned long long bytes = 0;
        int r;
 
-       r = blockdev_size(f->fd, &bytes);
+       if (td->io_ops->open_file(td, f)) {
+               log_err("fio: failed opening blockdev %s for size check\n",
+                       f->file_name);
+               return 1;
+       }
+
+       r = blockdev_size(f, &bytes);
        if (r) {
                td_verror(td, r, "blockdev_size");
+               goto err;
+       }
+
+       if (!bytes) {
+               log_err("%s: zero sized block device?\n", f->file_name);
+               goto err;
+       }
+
+       f->real_file_size = bytes;
+       td->io_ops->close_file(td, f);
+       return 0;
+err:
+       td->io_ops->close_file(td, f);
+       return 1;
+}
+
+static int char_size(struct thread_data *td, struct fio_file *f)
+{
+#ifdef FIO_HAVE_CHARDEV_SIZE
+       unsigned long long bytes = 0;
+       int r;
+
+       if (td->io_ops->open_file(td, f)) {
+               log_err("fio: failed opening blockdev %s for size check\n",
+                       f->file_name);
                return 1;
        }
 
+       r = chardev_size(f, &bytes);
+       if (r) {
+               td_verror(td, r, "chardev_size");
+               goto err;
+       }
+
+       if (!bytes) {
+               log_err("%s: zero sized char device?\n", f->file_name);
+               goto err;
+       }
+
        f->real_file_size = bytes;
+       td->io_ops->close_file(td, f);
        return 0;
+err:
+       td->io_ops->close_file(td, f);
+       return 1;
+#else
+       f->real_file_size = -1ULL;
+       return 0;
+#endif
 }
 
 static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
        int ret = 0;
 
-       if (f->flags & FIO_SIZE_KNOWN)
+       if (fio_file_size_known(f))
                return 0;
 
        if (f->filetype == FIO_TYPE_FILE)
                ret = file_size(td, f);
        else if (f->filetype == FIO_TYPE_BD)
                ret = bdev_size(td, f);
+       else if (f->filetype == FIO_TYPE_CHAR)
+               ret = char_size(td, f);
        else
                f->real_file_size = -1;
 
@@ -176,12 +351,12 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return ret;
 
        if (f->file_offset > f->real_file_size) {
-               log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name,
+               log_err("%s: offset extends end (%llu > %llu)\n", td->o.name,
                                        f->file_offset, f->real_file_size);
                return 1;
        }
 
-       f->flags |= FIO_SIZE_KNOWN;
+       fio_file_set_size_known(f);
        return 0;
 }
 
@@ -196,18 +371,24 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        if (off == -1ULL)
                off = f->file_offset;
 
+       if (len == -1ULL || off == -1ULL)
+               return 0;
+
        dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
                                                                len);
 
        /*
         * FIXME: add blockdev flushing too
         */
-       if (f->mmap)
-               ret = madvise(f->mmap, len, MADV_DONTNEED);
-       else if (f->filetype == FIO_TYPE_FILE) {
-               ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
+       if (f->mmap_ptr) {
+               ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
+#ifdef FIO_MADV_FREE
+               (void) posix_madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE);
+#endif
+       } else if (f->filetype == FIO_TYPE_FILE) {
+               ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
        } else if (f->filetype == FIO_TYPE_BD) {
-               ret = blockdev_invalidate_cache(f->fd);
+               ret = blockdev_invalidate_cache(f);
                if (ret < 0 && errno == EACCES && geteuid()) {
                        if (!root_warn) {
                                log_err("fio: only root may flush block "
@@ -233,10 +414,10 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 
 int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
-       if (!(f->flags & FIO_FILE_OPEN))
+       if (!fio_file_open(f))
                return 0;
 
-       return __file_invalidate_cache(td, f, -1, -1);
+       return __file_invalidate_cache(td, f, -1ULL, -1ULL);
 }
 
 int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
@@ -307,6 +488,8 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
                flags |= O_SYNC;
        if (f->filetype != FIO_TYPE_FILE)
                flags |= FIO_O_NOATIME;
+       if (td->o.create_on_open)
+               flags |= O_CREAT;
 
 open_again:
        if (td_write(td)) {
@@ -336,22 +519,24 @@ open_again:
                char buf[FIO_VERROR_SIZE];
                int __e = errno;
 
-               if (errno == EPERM && (flags & FIO_O_NOATIME)) {
+               if (__e == EPERM && (flags & FIO_O_NOATIME)) {
                        flags &= ~FIO_O_NOATIME;
                        goto open_again;
                }
 
                snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
 
+               if (__e == EINVAL && (flags & OS_O_DIRECT)) {
+                       log_err("fio: looks like your file system does not " \
+                               "support direct=1/buffered=0\n");
+               }
+
                td_verror(td, __e, buf);
        }
 
-       if (get_file_size(td, f))
-               goto err;
-
        if (!from_hash && f->fd != -1) {
                if (add_file_hash(f)) {
-                       int ret;
+                       int fio_unused ret;
 
                        /*
                         * OK to ignore, we haven't done anything with it
@@ -362,43 +547,11 @@ open_again:
        }
 
        return 0;
-err:
-       close(f->fd);
-       return 1;
 }
 
-int open_files(struct thread_data *td)
+int generic_get_file_size(struct thread_data *td, struct fio_file *f)
 {
-       struct fio_file *f;
-       unsigned int i;
-       int err = 0;
-
-       dprint(FD_FILE, "open files\n");
-
-       for_each_file(td, f, i) {
-               err = td_io_open_file(td, f);
-               if (err) {
-                       if (td->error == EMFILE) {
-                               log_err("fio: limited open files to: %d\n",
-                                                       td->nr_open_files);
-                               td->o.open_files = td->nr_open_files;
-                               err = 0;
-                               clear_error(td);
-                       }
-                       break;
-               }
-
-               if (td->o.open_files == td->nr_open_files)
-                       break;
-       }
-
-       if (!err)
-               return 0;
-
-       for_each_file(td, f, i)
-               td_io_close_file(td, f);
-
-       return err;
+       return get_file_size(td, f);
 }
 
 /*
@@ -414,15 +567,12 @@ static int get_file_sizes(struct thread_data *td)
                dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i,
                                                                f->file_name);
 
-               if (td->io_ops->open_file(td, f)) {
+               if (td_io_get_file_size(td, f)) {
                        if (td->error != ENOENT) {
                                log_err("%s\n", td->verror);
                                err = 1;
                        }
                        clear_error(td);
-               } else {
-                       if (td->io_ops->close_file)
-                               td->io_ops->close_file(td, f);
                }
 
                if (f->real_file_size == -1ULL && td->o.size)
@@ -432,6 +582,81 @@ static int get_file_sizes(struct thread_data *td)
        return err;
 }
 
+struct fio_mount {
+       struct flist_head list;
+       const char *base;
+       char __base[256];
+       unsigned int key;
+};
+
+/*
+ * Get free number of bytes for each file on each unique mount.
+ */
+static unsigned long long get_fs_free_counts(struct thread_data *td)
+{
+       struct flist_head *n, *tmp;
+       unsigned long long ret = 0;
+       struct fio_mount *fm;
+       FLIST_HEAD(list);
+       struct fio_file *f;
+       unsigned int i;
+
+       for_each_file(td, f, i) {
+               struct stat sb;
+               char buf[256];
+
+               if (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_CHAR) {
+                       if (f->real_file_size != -1ULL)
+                               ret += f->real_file_size;
+                       continue;
+               } else if (f->filetype != FIO_TYPE_FILE)
+                       continue;
+
+               strcpy(buf, f->file_name);
+
+               if (stat(buf, &sb) < 0) {
+                       if (errno != ENOENT)
+                               break;
+                       strcpy(buf, ".");
+                       if (stat(buf, &sb) < 0)
+                               break;
+               }
+
+               fm = NULL;
+               flist_for_each(n, &list) {
+                       fm = flist_entry(n, struct fio_mount, list);
+                       if (fm->key == sb.st_dev)
+                               break;
+
+                       fm = NULL;
+               }
+
+               if (fm)
+                       continue;
+
+               fm = malloc(sizeof(*fm));
+               strcpy(fm->__base, buf);
+               fm->base = basename(fm->__base);
+               fm->key = sb.st_dev;
+               flist_add(&fm->list, &list);
+       }
+
+       flist_for_each_safe(n, tmp, &list) {
+               unsigned long long sz;
+
+               fm = flist_entry(n, struct fio_mount, list);
+               flist_del(&fm->list);
+
+               sz = get_fs_size(fm->base);
+               if (sz && sz != -1ULL)
+                       ret += sz;
+
+               free(fm);
+       }
+
+       return ret;
+}
+
 /*
  * Open the files and setup files sizes, creating files if necessary.
  */
@@ -445,7 +670,7 @@ int setup_files(struct thread_data *td)
        dprint(FD_FILE, "setup files\n");
 
        if (td->o.read_iolog_file)
-               return 0;
+               goto done;
 
        /*
         * if ioengine defines a setup() method, it's responsible for
@@ -472,6 +697,9 @@ int setup_files(struct thread_data *td)
                        total_size += f->real_file_size;
        }
 
+       if (td->o.fill_device)
+               td->fill_device_size = get_fs_free_counts(td);
+
        /*
         * device/file sizes are zero and no size given, punt
         */
@@ -490,7 +718,8 @@ int setup_files(struct thread_data *td)
        extend_size = total_size = 0;
        need_extend = 0;
        for_each_file(td, f, i) {
-               f->file_offset = td->o.start_offset;
+               f->file_offset = td->o.start_offset +
+                       (td->thread_number - 1) * td->o.offset_increment;
 
                if (!td->o.file_size_low) {
                        /*
@@ -527,12 +756,18 @@ int setup_files(struct thread_data *td)
                if (f->filetype == FIO_TYPE_FILE &&
                    (f->io_size + f->file_offset) > f->real_file_size &&
                    !(td->io_ops->flags & FIO_DISKLESSIO)) {
-                       need_extend++;
-                       extend_size += (f->io_size + f->file_offset);
-                       f->flags |= FIO_FILE_EXTEND;
+                       if (!td->o.create_on_open) {
+                               need_extend++;
+                               extend_size += (f->io_size + f->file_offset);
+                       } else
+                               f->real_file_size = f->io_size + f->file_offset;
+                       fio_file_set_extend(f);
                }
        }
 
+       if (td->o.size_percent)
+               total_size = (total_size * td->o.size_percent) / 100;
+
        if (!td->o.size || td->o.size > total_size)
                td->o.size = total_size;
 
@@ -541,24 +776,29 @@ int setup_files(struct thread_data *td)
         */
        if (need_extend) {
                temp_stall_ts = 1;
-               log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
-                       td->o.name, need_extend, extend_size >> 20);
+               if (!terse_output)
+                       log_info("%s: Laying out IO file(s) (%u file(s) /"
+                                " %lluMB)\n", td->o.name, need_extend,
+                                       extend_size >> 20);
 
                for_each_file(td, f, i) {
-                       unsigned long long old_len, extend_len;
+                       unsigned long long old_len = -1ULL, extend_len = -1ULL;
 
-                       if (!(f->flags & FIO_FILE_EXTEND))
+                       if (!fio_file_extend(f))
                                continue;
 
                        assert(f->filetype == FIO_TYPE_FILE);
-                       f->flags &= ~FIO_FILE_EXTEND;
-                       old_len = f->real_file_size;
-                       extend_len = f->io_size + f->file_offset - old_len;
+                       fio_file_clear_extend(f);
+                       if (!td->o.fill_device) {
+                               old_len = f->real_file_size;
+                               extend_len = f->io_size + f->file_offset -
+                                               old_len;
+                       }
                        f->real_file_size = (f->io_size + f->file_offset);
                        err = extend_file(td, f);
                        if (err)
                                break;
-                       
+
                        err = __file_invalidate_cache(td, f, old_len,
                                                                extend_len);
                        close(f->fd);
@@ -581,12 +821,31 @@ int setup_files(struct thread_data *td)
         */
        if (!td->o.read_iolog_file)
                td->total_io_size = td->o.size * td->o.loops;
+
+done:
+       if (td->o.create_only)
+               td->done = 1;
+
        return 0;
 err_offset:
        log_err("%s: you need to specify valid offset=\n", td->o.name);
        return 1;
 }
 
+int pre_read_files(struct thread_data *td)
+{
+       struct fio_file *f;
+       unsigned int i;
+
+       dprint(FD_FILE, "pre_read files\n");
+
+       for_each_file(td, f, i) {
+               pre_read_file(td, f);
+       }
+
+       return 1;
+}
+
 int init_random_map(struct thread_data *td)
 {
        unsigned long long blocks, num_maps;
@@ -601,11 +860,15 @@ int init_random_map(struct thread_data *td)
                                (unsigned long long) td->o.rw_min_bs;
                num_maps = (blocks + BLOCKS_PER_MAP - 1) /
                                (unsigned long long) BLOCKS_PER_MAP;
-               f->file_map = smalloc(num_maps * sizeof(int));
-               if (f->file_map) {
-                       f->num_maps = num_maps;
-                       continue;
-               }
+               if (num_maps == (unsigned long) num_maps) {
+                       f->file_map = smalloc(num_maps * sizeof(unsigned long));
+                       if (f->file_map) {
+                               f->num_maps = num_maps;
+                               continue;
+                       }
+               } else
+                       f->file_map = NULL;
+
                if (!td->o.softrandommap) {
                        log_err("fio: failed allocating random map. If running"
                                " a large number of jobs, try the 'norandommap'"
@@ -627,8 +890,10 @@ void close_files(struct thread_data *td)
        struct fio_file *f;
        unsigned int i;
 
-       for_each_file(td, f, i)
-               td_io_close_file(td, f);
+       for_each_file(td, f, i) {
+               if (fio_file_open(f))
+                       td_io_close_file(td, f);
+       }
 }
 
 void close_and_free_files(struct thread_data *td)
@@ -644,15 +909,15 @@ void close_and_free_files(struct thread_data *td)
                        unlink(f->file_name);
                }
 
-               td_io_close_file(td, f);
+               if (fio_file_open(f))
+                       td_io_close_file(td, f);
+
+               remove_file_hash(f);
 
                sfree(f->file_name);
                f->file_name = NULL;
-
-               if (f->file_map) {
-                       sfree(f->file_map);
-                       f->file_map = NULL;
-               }
+               sfree(f->file_map);
+               f->file_map = NULL;
                sfree(f);
        }
 
@@ -672,7 +937,12 @@ static void get_file_type(struct fio_file *f)
        else
                f->filetype = FIO_TYPE_FILE;
 
-       if (!lstat(f->file_name, &sb)) {
+       /* \\.\ is the device namespace in Windows, where every file is
+        * a block device */
+       if (strncmp(f->file_name, "\\\\.\\", 4) == 0)
+               f->filetype = FIO_TYPE_BD;
+
+       if (!stat(f->file_name, &sb)) {
                if (S_ISBLK(sb.st_mode))
                        f->filetype = FIO_TYPE_BD;
                else if (S_ISCHR(sb.st_mode))
@@ -692,12 +962,24 @@ int add_file(struct thread_data *td, const char *fname)
        dprint(FD_FILE, "add file %s\n", fname);
 
        f = smalloc(sizeof(*f));
+       if (!f) {
+               log_err("fio: smalloc OOM\n");
+               assert(0);
+       }
+
        f->fd = -1;
+       fio_file_reset(f);
+
+       if (td->files_size <= td->files_index) {
+               int new_size = td->o.nr_files + 1;
 
-       dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
+               dprint(FD_FILE, "resize file array to %d files\n", new_size);
 
-       td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+               td->files = realloc(td->files, new_size * sizeof(f));
+               td->files_size = new_size;
+       }
        td->files[cur_files] = f;
+       f->fileno = cur_files;
 
        /*
         * init function, io engine may not be loaded yet
@@ -710,6 +992,10 @@ int add_file(struct thread_data *td, const char *fname)
 
        sprintf(file_name + len, "%s", fname);
        f->file_name = smalloc_strdup(file_name);
+       if (!f->file_name) {
+               log_err("fio: smalloc OOM\n");
+               assert(0);
+       }
 
        get_file_type(f);
 
@@ -737,10 +1023,23 @@ int add_file(struct thread_data *td, const char *fname)
        return cur_files;
 }
 
+int add_file_exclusive(struct thread_data *td, const char *fname)
+{
+       struct fio_file *f;
+       unsigned int i;
+
+       for_each_file(td, f, i) {
+               if (!strcmp(f->file_name, fname))
+                       return i;
+       }
+
+       return add_file(td, fname);
+}
+
 void get_file(struct fio_file *f)
 {
        dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
-       assert(f->flags & FIO_FILE_OPEN);
+       assert(fio_file_open(f));
        f->references++;
 }
 
@@ -750,8 +1049,10 @@ int put_file(struct thread_data *td, struct fio_file *f)
 
        dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references);
 
-       if (!(f->flags & FIO_FILE_OPEN))
+       if (!fio_file_open(f)) {
+               assert(f->fd == -1);
                return 0;
+       }
 
        assert(f->references);
        if (--f->references)
@@ -767,7 +1068,8 @@ int put_file(struct thread_data *td, struct fio_file *f)
                ret = f_ret;
 
        td->nr_open_files--;
-       f->flags &= ~FIO_FILE_OPEN;
+       fio_file_clear_open(f);
+       assert(f->fd == -1);
        return ret;
 }
 
@@ -851,7 +1153,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
                if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
                        continue;
 
-               sprintf(full_path, "%s/%s", dirname, dir->d_name);
+               sprintf(full_path, "%s%s%s", dirname, FIO_OS_PATH_SEPARATOR, dir->d_name);
 
                if (lstat(full_path, &sb) == -1) {
                        if (errno != ENOENT) {
@@ -903,9 +1205,22 @@ void dup_files(struct thread_data *td, struct thread_data *org)
                struct fio_file *__f;
 
                __f = smalloc(sizeof(*__f));
+               if (!__f) {
+                       log_err("fio: smalloc OOM\n");
+                       assert(0);
+               }
+               __f->fd = -1;
+               fio_file_reset(__f);
 
-               if (f->file_name)
+               if (f->file_name) {
                        __f->file_name = smalloc_strdup(f->file_name);
+                       if (!__f->file_name) {
+                               log_err("fio: smalloc OOM\n");
+                               assert(0);
+                       }
+
+                       __f->filetype = f->filetype;
+               }
 
                td->files[i] = __f;
        }