Overwrite fix
[fio.git] / filesetup.c
index cf9fa3c4fb665f30854b36c2cb25b0dd88f43116..48b034a6b4f83d4913e94a19a72611e8d1755e80 100644 (file)
@@ -15,7 +15,8 @@ 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 (lstat(f->file_name, &st) == -1)
@@ -97,7 +98,7 @@ err:
 static int create_files(struct thread_data *td)
 {
        struct fio_file *f;
-       int i, err, need_create;
+       int i, err, need_create, can_extend;
 
        for_each_file(td, f, i)
                f->file_size = td->total_file_size / td->nr_files;
@@ -105,7 +106,8 @@ static int create_files(struct thread_data *td)
        /*
         * unless specifically asked for overwrite, let normal io extend it
         */
-       if (!td->overwrite)
+       can_extend = !td->overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
+       if (can_extend)
                return 0;
 
        need_create = 0;
@@ -159,16 +161,6 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
        struct stat st;
 
-       /*
-        * if we are not doing real io, just pretend the file is as large
-        * as the size= given. this works fine with nrfiles > 1 as well,
-        * we only really care about it being at least as big as size=
-        */
-       if (td->io_ops->flags & FIO_NULLIO) {
-               f->real_file_size = f->file_size = td->total_file_size;
-               return 0;
-       }
-
        if (td->overwrite) {
                if (fstat(f->fd, &st) == -1) {
                        td_verror(td, errno, "fstat");
@@ -234,17 +226,18 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
        int ret = 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) {
-               if (!td->odirect)
-                       ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+               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);
+               ret = blockdev_invalidate_cache(f->fd);
        } else if (td->filetype == FIO_TYPE_CHAR)
                ret = 0;
 
@@ -256,168 +249,89 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
        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, "mmap");
-               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)
+                       flags |= O_CREAT;
 
-       if (!td_random(td)) {
-               if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
-                       td_verror(td, errno, "madvise");
-                       return 1;
-               }
+               f->fd = open(f->file_name, flags, 0600);
        } else {
-               if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
-                       td_verror(td, errno, "madvise");
-                       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;
+               goto err;
 
        if (!td_random(td)) {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
                        td_verror(td, errno, "fadvise");
-                       return 1;
+                       goto err;
                }
        } else {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
                        td_verror(td, errno, "fadvise");
-                       return 1;
+                       goto err;
                }
        }
 
        return 0;
+err:
+       close(f->fd);
+       return 1;
 }
 
-static int setup_files_plain(struct thread_data *td)
+int open_files(struct thread_data *td)
 {
        struct fio_file *f;
        int i, err = 0;
 
        for_each_file(td, f, i) {
-               err = __setup_file_plain(td, f);
+               err = td_io_open_file(td, f);
                if (err)
                        break;
-       }
-
-       return err;
-}
 
-static int setup_file(struct thread_data *td, struct fio_file *f)
-{
-       int flags = 0;
-
-       if (td->io_ops->flags & FIO_SELFOPEN)
-               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) {
-               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))
-               return 1;
-
-       return 0;
-}
-
-int open_files(struct thread_data *td)
-{
-       struct fio_file *f;
-       int i, err = 0;
-
-       for_each_file(td, f, i) {
-               err = setup_file(td, f);
-               if (err)
+               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;
 }
@@ -448,6 +362,8 @@ int setup_files(struct thread_data *td)
        for_each_file(td, f, i)
                td->total_file_size += f->file_size;
 
+       td->total_file_size = (td->total_file_size * td->nr_files) / td->open_files;
+
        td->io_size = td->total_file_size;
        if (td->io_size == 0) {
                log_err("%s: no io blocks\n", td->name);
@@ -460,17 +376,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;
 }
@@ -487,14 +394,11 @@ 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);
+
+               if (f->file_map)
+                       free(f->file_map);
        }
 
        td->filename = NULL;