Revamp file open/close handling
[fio.git] / filesetup.c
index 1f1259d1ac156bd99666b73e8a6a71ecdd4d28ee..f4004588fcd4f9ac803322528d8a5f5876027510 100644 (file)
@@ -15,12 +15,19 @@ static int file_ok(struct thread_data *td, struct fio_file *f)
 {
        struct stat st;
 
-       if (td->filetype != FIO_TYPE_FILE || (td->io_ops->flags & FIO_NULLIO))
+       if (td->filetype != FIO_TYPE_FILE ||
+           (td->io_ops->flags & FIO_DISKLESSIO))
                return 0;
 
-       if (stat(f->file_name, &st) == -1)
+       if (lstat(f->file_name, &st) == -1)
                return 1;
-       else if (st.st_size < (off_t) f->file_size)
+
+       /*
+        * if it's a special file, size is always ok for now
+        */
+       if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))
+               return 0;
+       if (st.st_size < (off_t) f->file_size)
                return 1;
 
        return 0;
@@ -35,17 +42,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;
        }
 
@@ -65,9 +72,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;
                }
@@ -107,8 +114,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;
                        }
@@ -122,7 +128,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;
        }
 
@@ -156,7 +162,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;
                }
 
@@ -177,7 +183,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;
        }
 
@@ -219,162 +225,110 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
        int ret = 0;
 
+       if (!td->invalidate_cache)
+               return 0;
+       if (!td->odirect)
+               return 0;
+
        /*
         * FIXME: add blockdev flushing too
         */
-       if (td->io_ops->flags & FIO_MMAPIO)
+       if (f->mmap)
                ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
-       else if (td->filetype == FIO_TYPE_FILE)
+       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)
+       } 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_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)
+void generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
 {
-       int flags;
+       close(f->fd);
+       f->fd = -1;
+}
 
-       if (td_rw(td))
-               flags = PROT_READ | PROT_WRITE;
-       else if (td_write(td)) {
-               flags = PROT_WRITE;
+int generic_open_file(struct thread_data *td, struct fio_file *f)
+{
+       int flags = 0;
 
-               if (td->verify != VERIFY_NONE)
-                       flags |= PROT_READ;
-       } else
-               flags = PROT_READ;
+       if (td->odirect)
+               flags |= OS_O_DIRECT;
+       if (td->sync_io)
+               flags |= O_SYNC;
 
-       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);
-               return 1;
-       }
+       if (td_write(td) || td_rw(td)) {
+               flags |= O_RDWR;
 
-       if (td->invalidate_cache && file_invalidate_cache(td, f))
-               return 1;
+               if (td->filetype == FIO_TYPE_FILE) {
+                       if (!td->overwrite)
+                               flags |= O_TRUNC;
 
-       if (td->sequential) {
-               if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
-                       td_verror(td, errno);
-                       return 1;
+                       flags |= O_CREAT;
                }
+
+               f->fd = open(f->file_name, flags, 0600);
        } else {
-               if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
-                       td_verror(td, errno);
-                       return 1;
-               }
-       }
+               if (td->filetype == FIO_TYPE_CHAR)
+                       flags |= O_RDWR;
+               else
+                       flags |= O_RDONLY;
 
-       return 0;
-}
+               f->fd = open(f->file_name, flags);
+       }
 
-static int setup_files_mmap(struct thread_data *td)
-{
-       struct fio_file *f;
-       int i, err = 0;
+       if (f->fd == -1) {
+               int __e = errno;
 
-       for_each_file(td, f, i) {
-               err = __setup_file_mmap(td, f);
-               if (err)
-                       break;
+               td_verror(td, __e, "open");
+               if (__e == EINVAL && td->odirect)
+                       log_err("fio: destination does not support O_DIRECT\n");
+               return 1;
        }
 
-       return err;
-}
+       if (get_file_size(td, f))
+               goto err;
 
-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 (file_invalidate_cache(td, f))
+               goto err;
 
-       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);
-                       return 1;
+                       td_verror(td, errno, "fadvise");
+                       goto err;
                }
        } else {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
-                       td_verror(td, errno);
-                       return 1;
+                       td_verror(td, errno, "fadvise");
+                       goto err;
                }
        }
 
        return 0;
+err:
+       close(f->fd);
+       return 1;
 }
 
-static int setup_files_plain(struct thread_data *td)
-{
-       struct fio_file *f;
-       int i, err = 0;
-
-       for_each_file(td, f, i) {
-               err = __setup_file_plain(td, f);
-               if (err)
-                       break;
-       }
-
-       return err;
-}
-
-static int setup_file(struct thread_data *td, struct fio_file *f)
+int reopen_file(struct thread_data *td, struct fio_file *f)
 {
-       int flags = 0;
-
-       if (td->io_ops->flags & FIO_NETIO)
-               return 0;
-
-       /*
-        * we need a valid file descriptor, but don't create a real file.
-        * lets just dup stdout, seems like a sensible approach.
-        */
-       if (td->io_ops->flags & FIO_NULLIO)
-               f->fd = dup(STDOUT_FILENO);
-       else {
-               if (td->odirect)
-                       flags |= OS_O_DIRECT;
-               if (td->sync_io)
-                       flags |= O_SYNC;
-
-               if (td_write(td) || td_rw(td)) {
-                       flags |= O_RDWR;
-
-                       if (td->filetype == FIO_TYPE_FILE) {
-                               if (!td->overwrite)
-                                       flags |= O_TRUNC;
-
-                               flags |= O_CREAT;
-                       }
-
-                       f->fd = open(f->file_name, flags, 0600);
-               } else {
-                       if (td->filetype == FIO_TYPE_CHAR)
-                               flags |= O_RDWR;
-                       else
-                               flags |= O_RDONLY;
-
-                       f->fd = open(f->file_name, flags);
-               }
-       }
-
-       if (f->fd == -1) {
-               td_verror(td, errno);
-               return 1;
-       }
+       f->last_free_lookup = 0;
+       f->last_completed_pos = 0;
+       f->last_pos = 0;
 
-       if (get_file_size(td, f))
-               return 1;
+       if (f->file_map)
+               memset(f->file_map, 0, f->num_maps * sizeof(long));
 
-       return 0;
+       printf("setting up %s again\n", f->file_name);
+       return td_io_open_file(td, f);
 }
 
 int open_files(struct thread_data *td)
@@ -383,20 +337,19 @@ int open_files(struct thread_data *td)
        int i, err = 0;
 
        for_each_file(td, f, i) {
-               err = setup_file(td, f);
+               err = td_io_open_file(td, f);
                if (err)
                        break;
+
+               if (td->open_files == td->nr_open_files)
+                       break;
        }
 
        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)
+               td_io_close_file(td, f);
 
        return err;
 }
@@ -430,7 +383,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;
        }
 
@@ -439,17 +392,8 @@ int setup_files(struct thread_data *td)
 
        td->total_io_size = td->io_size * td->loops;
 
-       if (td->io_ops->flags & FIO_MMAPIO)
-               err = setup_files_mmap(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)
+               td_io_close_file(td, f);
 
        return err;
 }
@@ -466,14 +410,8 @@ 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;
-               }
-               if (f->mmap) {
-                       munmap(f->mmap, f->file_size);
-                       f->mmap = NULL;
-               }
+
+               td_io_close_file(td, f);
        }
 
        td->filename = NULL;