Multiple file handling fixes

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index bae7526a168ed431392b09f838fe5e5997ab2006..08c365d916fecfa70e4422f6381e39d27e6575c4 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -9,6 +9,7 @@
 
 #include "fio.h"
 #include "smalloc.h"
+#include "filehash.h"
 
 static int root_warn;
 
@@ -215,6 +216,9 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
        int ret = 0;
 
        dprint(FD_FILE, "fd close %s\n", f->file_name);
+
+       remove_file_hash(f);
+
        if (close(f->fd) < 0)
                ret = errno;
 
@@ -222,10 +226,38 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
        return ret;
 }
 
+static int file_lookup_open(struct fio_file *f, int flags)
+{
+       struct fio_file *__f;
+       int from_hash;
+
+       __f = lookup_file_hash(f->file_name);
+       if (__f) {
+               dprint(FD_FILE, "found file in hash %s\n", f->file_name);
+               /*
+                * racy, need the __f->lock locked
+                */
+               f->lock = __f->lock;
+               f->lock_owner = __f->lock_owner;
+               f->lock_batch = __f->lock_batch;
+               f->lock_ddir = __f->lock_ddir;
+               f->fd = dup(__f->fd);
+               f->references++;
+               from_hash = 1;
+       } else {
+               dprint(FD_FILE, "file not found in hash %s\n", f->file_name);
+               f->fd = open(f->file_name, flags, 0600);
+               from_hash = 0;
+       }
+
+       return from_hash;
+}
+
 int generic_open_file(struct thread_data *td, struct fio_file *f)
 {
        int is_std = 0;
        int flags = 0;
+       int from_hash = 0;
 
        dprint(FD_FILE, "fd open %s\n", f->file_name);
 
@@ -262,7 +294,7 @@ open_again:
                if (is_std)
                        f->fd = dup(STDOUT_FILENO);
                else
-                       f->fd = open(f->file_name, flags, 0600);
+                       from_hash = file_lookup_open(f, flags);
        } else {
                if (f->filetype == FIO_TYPE_CHAR && !read_only)
                        flags |= O_RDWR;
@@ -272,7 +304,7 @@ open_again:
                if (is_std)
                        f->fd = dup(STDIN_FILENO);
                else
-                       f->fd = open(f->file_name, flags);
+                       from_hash = file_lookup_open(f, flags);
        }
 
        if (f->fd == -1) {
@@ -292,6 +324,18 @@ open_again:
        if (get_file_size(td, f))
                goto err;
 
+       if (!from_hash && f->fd != -1) {
+               if (add_file_hash(f)) {
+                       int ret;
+
+                       /*
+                        * OK to ignore, we haven't done anything with it
+                        */
+                       ret = generic_close_file(td, f);
+                       goto open_again;
+               }
+       }
+
        return 0;
 err:
        close(f->fd);
@@ -341,6 +385,8 @@ static int get_file_sizes(struct thread_data *td)
        int err = 0;
 
        for_each_file(td, f, i) {
+               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->error != ENOENT) {
                                log_err("%s\n", td->verror);
@@ -554,6 +600,7 @@ void close_and_free_files(struct thread_data *td)
 
        td->o.filename = NULL;
        free(td->files);
+       td->files_index = 0;
        td->files = NULL;
        td->o.nr_files = 0;
 }
@@ -589,8 +636,9 @@ int add_file(struct thread_data *td, const char *fname)
        f = smalloc(sizeof(*f));
        f->fd = -1;
 
-       td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+       dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
 
+       td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
        td->files[cur_files] = f;
 
        /*
@@ -607,10 +655,26 @@ int add_file(struct thread_data *td, const char *fname)
 
        get_file_type(f);
 
+       switch (td->o.file_lock_mode) {
+       case FILE_LOCK_NONE:
+               break;
+       case FILE_LOCK_READWRITE:
+               f->lock = fio_mutex_rw_init();
+               break;
+       case FILE_LOCK_EXCLUSIVE:
+               f->lock = fio_mutex_init(1);
+               break;
+       default:
+               log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode);
+               assert(0);
+       }
+
        td->files_index++;
        if (f->filetype == FIO_TYPE_FILE)
                td->nr_normal_files++;
 
+       dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name, cur_files);
+
        return cur_files;
 }
 
@@ -645,12 +709,62 @@ int put_file(struct thread_data *td, struct fio_file *f)
        return ret;
 }
 
-void lock_file(struct thread_data *td, struct fio_file *f)
+void lock_file(struct thread_data *td, struct fio_file *f, enum fio_ddir ddir)
 {
+       if (!f->lock || td->o.file_lock_mode == FILE_LOCK_NONE)
+               return;
+
+       if (f->lock_owner == td && f->lock_batch--)
+               return;
+
+       if (td->o.file_lock_mode == FILE_LOCK_READWRITE) {
+               if (ddir == DDIR_READ)
+                       fio_mutex_down_read(f->lock);
+               else
+                       fio_mutex_down_write(f->lock);
+       } else if (td->o.file_lock_mode == FILE_LOCK_EXCLUSIVE)
+               fio_mutex_down(f->lock);
+
+       f->lock_owner = td;
+       f->lock_batch = td->o.lockfile_batch;
+       f->lock_ddir = ddir;
 }
 
-void unlock_file(struct fio_file *f)
+void unlock_file(struct thread_data *td, struct fio_file *f)
 {
+       if (!f->lock || td->o.file_lock_mode == FILE_LOCK_NONE)
+               return;
+       if (f->lock_batch)
+               return;
+
+       if (td->o.file_lock_mode == FILE_LOCK_READWRITE) {
+               const int is_read = f->lock_ddir == DDIR_READ;
+               int val = fio_mutex_getval(f->lock);
+
+               if ((is_read && val == 1) || (!is_read && val == -1))
+                       f->lock_owner = NULL;
+
+               if (is_read)
+                       fio_mutex_up_read(f->lock);
+               else
+                       fio_mutex_up_write(f->lock);
+       } else if (td->o.file_lock_mode == FILE_LOCK_EXCLUSIVE) {
+               int val = fio_mutex_getval(f->lock);
+
+               if (val == 0)
+                       f->lock_owner = NULL;
+
+               fio_mutex_up(f->lock);
+       }
+}
+
+void unlock_file_all(struct thread_data *td, struct fio_file *f)
+{
+       if (f->lock_owner != td)
+               return;
+
+       f->lock_batch = 0;
+       unlock_file(td, f);
 }
 
 static int recurse_dir(struct thread_data *td, const char *dirname)
@@ -714,16 +828,15 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 {
        struct fio_file *f;
        unsigned int i;
-       size_t bytes;
+
+       dprint(FD_FILE, "dup files: %d\n", org->files_index);
 
        if (!org->files)
                return;
 
-       bytes = org->files_index * sizeof(f);
-       td->files = malloc(bytes);
-       memcpy(td->files, org->files, bytes);
+       td->files = malloc(org->files_index * sizeof(f));
 
-       for_each_file(td, f, i) {
+       for_each_file(org, f, i) {
                struct fio_file *__f;
 
                __f = smalloc(sizeof(*__f));