Better management of open files

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 08742247d58c1f345303fbedb968c3594650aa48..850dc2f078cd0967703624fc51f6dc2f634dae3f 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,6 +8,30 @@
 #include "fio.h"
 #include "os.h"
 
+int open_file(struct thread_data *td, struct fio_file *f, int flags, int perm)
+{
+       if (flags & O_CREAT)
+               f->fd = open(f->file_name, flags, perm);
+       else
+               f->fd = open(f->file_name, flags);
+
+       if (f->fd != -1) {
+               td->nr_open_files++;
+               return 0;
+       }
+
+       return 1;
+}
+
+void close_file(struct thread_data *td, struct fio_file *f)
+{
+       if (f->fd != -1) {
+               close(f->fd);
+               f->fd = -1;
+               td->nr_open_files--;
+       }
+}
+
 /*
  * Check if the file exists and it's large enough.
  */
@@ -41,17 +65,17 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 
        f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
        if (f->fd < 0) {
-               td_verror(td, errno);
+               td_verror(td, errno, "open");
                return 1;
        }
 
        if (ftruncate(f->fd, f->file_size) == -1) {
-               td_verror(td, errno);
+               td_verror(td, errno, "ftruncate");
                goto err;
        }
 
        if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
-               td_verror(td, errno);
+               td_verror(td, errno, "posix_fallocate");
                goto err;
        }
 
@@ -71,9 +95,9 @@ static int create_file(struct thread_data *td, struct fio_file *f)
                        continue;
                } else {
                        if (r < 0)
-                               td_verror(td, errno);
+                               td_verror(td, errno, "write");
                        else
-                               td_verror(td, EIO);
+                               td_verror(td, EIO, "write");
 
                        break;
                }
@@ -113,8 +137,7 @@ static int create_files(struct thread_data *td)
                for_each_file(td, f, i) {
                        int file_there = !file_ok(td, f);
 
-                       if (file_there && td->ddir == DDIR_WRITE &&
-                           !td->overwrite) {
+                       if (file_there && td_write(td) && !td->overwrite) {
                                unlink(f->file_name);
                                file_there = 0;
                        }
@@ -128,7 +151,7 @@ static int create_files(struct thread_data *td)
 
        if (!td->total_file_size) {
                log_err("Need size for create\n");
-               td_verror(td, EINVAL);
+               td_verror(td, EINVAL, "file_size");
                return 1;
        }
 
@@ -172,7 +195,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
        if (td->overwrite) {
                if (fstat(f->fd, &st) == -1) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "fstat");
                        return 1;
                }
 
@@ -193,7 +216,7 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
 
        r = blockdev_size(f->fd, &bytes);
        if (r) {
-               td_verror(td, r);
+               td_verror(td, r, "blockdev_size");
                return 1;
        }
 
@@ -240,19 +263,21 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
         */
        if (td->io_ops->flags & FIO_MMAPIO)
                ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
-       else if (td->filetype == FIO_TYPE_FILE)
-               ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
-       else if (td->filetype == FIO_TYPE_BD)
-               ret = blockdev_invalidate_cache(f->fd);
-       else if (td->filetype == FIO_TYPE_CHAR)
+       else if (td->filetype == FIO_TYPE_FILE) {
+               if (!td->odirect)
+                       ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+       } else if (td->filetype == FIO_TYPE_BD) {
+               if (!td->odirect)
+                       ret = blockdev_invalidate_cache(f->fd);
+       } else if (td->filetype == FIO_TYPE_CHAR)
                ret = 0;
 
        if (ret < 0) {
-               td_verror(td, errno);
+               td_verror(td, errno, "invalidate_cache");
                return 1;
        }
 
-       return 0;
+       return ret;
 }
 
 static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
@@ -272,21 +297,21 @@ static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
        f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
        if (f->mmap == MAP_FAILED) {
                f->mmap = NULL;
-               td_verror(td, errno);
+               td_verror(td, errno, "mmap");
                return 1;
        }
 
        if (td->invalidate_cache && file_invalidate_cache(td, f))
                return 1;
 
-       if (td->sequential) {
+       if (!td_random(td)) {
                if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "madvise");
                        return 1;
                }
        } else {
                if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "madvise");
                        return 1;
                }
        }
@@ -313,14 +338,14 @@ static int __setup_file_plain(struct thread_data *td, struct fio_file *f)
        if (td->invalidate_cache && file_invalidate_cache(td, f))
                return 1;
 
-       if (td->sequential) {
+       if (!td_random(td)) {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "fadvise");
                        return 1;
                }
        } else {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "fadvise");
                        return 1;
                }
        }
@@ -346,7 +371,7 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 {
        int flags = 0;
 
-       if (td->io_ops->flags & FIO_NETIO)
+       if (td->io_ops->flags & FIO_SELFOPEN)
                return 0;
 
        /*
@@ -371,24 +396,30 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
                                flags |= O_CREAT;
                        }
 
-                       f->fd = open(f->file_name, flags, 0600);
+                       open_file(td, f, flags, 0600);
                } else {
                        if (td->filetype == FIO_TYPE_CHAR)
                                flags |= O_RDWR;
                        else
                                flags |= O_RDONLY;
 
-                       f->fd = open(f->file_name, flags);
+                       open_file(td, f, flags, 0);
                }
        }
 
        if (f->fd == -1) {
-               td_verror(td, errno);
+               int __e = errno;
+
+               td_verror(td, __e, "open");
+               if (__e == EINVAL && td->odirect)
+                       log_err("fio: destination does not support O_DIRECT\n");
                return 1;
        }
 
-       if (get_file_size(td, f))
+       if (get_file_size(td, f)) {
+               close_file(td, f);
                return 1;
+       }
 
        return 0;
 }
@@ -407,12 +438,8 @@ int open_files(struct thread_data *td)
        if (!err)
                return 0;
 
-       for_each_file(td, f, i) {
-               if (f->fd != -1) {
-                       close(f->fd);
-                       f->fd = -1;
-               }
-       }
+       for_each_file(td, f, i)
+               close_file(td, f);
 
        return err;
 }
@@ -446,7 +473,7 @@ int setup_files(struct thread_data *td)
        td->io_size = td->total_file_size;
        if (td->io_size == 0) {
                log_err("%s: no io blocks\n", td->name);
-               td_verror(td, EINVAL);
+               td_verror(td, EINVAL, "total_file_size");
                return 1;
        }
 
@@ -460,12 +487,8 @@ int setup_files(struct thread_data *td)
        else
                err = setup_files_plain(td);
 
-       for_each_file(td, f, i) {
-               if (f->fd != -1) {
-                       close(f->fd);
-                       f->fd = -1;
-               }
-       }
+       for_each_file(td, f, i)
+               close_file(td, f);
 
        return err;
 }
@@ -482,10 +505,9 @@ void close_files(struct thread_data *td)
                        free(f->file_name);
                        f->file_name = NULL;
                }
-               if (f->fd != -1) {
-                       close(f->fd);
-                       f->fd = -1;
-               }
+
+               close_file(td, f);
+
                if (f->mmap) {
                        munmap(f->mmap, f->file_size);
                        f->mmap = NULL;