[PATCH] More size fixes

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index adfe940d1a0b89e1a09d7353dcea2ab28ab73b8c..d6df4f9fccb7b699c7e5dcfe292bbd4b6d65d8ac 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,6 +8,24 @@
 #include "fio.h"
 #include "os.h"
 
+/*
+ * Check if the file exists and it's large enough.
+ */
+static int file_ok(struct thread_data *td, struct fio_file *f)
+{
+       struct stat st;
+
+       if (td->filetype != FIO_TYPE_FILE)
+               return 0;
+
+       if (stat(f->file_name, &st) == -1)
+               return 1;
+       else if (st.st_size < (off_t) f->file_size)
+               return 1;
+
+       return 0;
+}
+
 static int create_file(struct thread_data *td, struct fio_file *f)
 {
        unsigned long long left;
@@ -68,19 +86,26 @@ err:
 static int create_files(struct thread_data *td)
 {
        struct fio_file *f;
-       int i, err;
+       int i, err, need_create;
 
        /*
         * unless specifically asked for overwrite, let normal io extend it
         */
        if (!td->overwrite) {
-               td->io_size = td->total_file_size;
                for_each_file(td, f, i)
                        f->file_size = td->total_file_size / td->nr_files;
 
                return 0;
        }
 
+       need_create = 0;
+       if (td->filetype == FIO_TYPE_FILE)
+               for_each_file(td, f, i)
+                       need_create += file_ok(td, f);
+
+       if (!need_create)
+               return 0;
+
        if (!td->total_file_size) {
                log_err("Need size for create\n");
                td_verror(td, EINVAL);
@@ -88,16 +113,18 @@ static int create_files(struct thread_data *td)
        }
 
        temp_stall_ts = 1;
-       fprintf(f_out, "%s: Laying out IO file(s) (%LuMiB)\n",
-                                       td->name, td->total_file_size >> 20);
+       fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
+                               td->name, td->nr_files,
+                               (td->total_file_size >> 20) / td->nr_files,
+                               td->total_file_size >> 20);
 
        err = 0;
        for_each_file(td, f, i) {
-               f->file_size = td->total_file_size / td->nr_files;
-               err = create_file(td, f);
-                       break;
-
-               td->io_size += f->file_size;
+               if (file_ok(td, f)) {
+                       err = create_file(td, f);
+                       if (err)
+                               break;
+               }
        }
 
        temp_stall_ts = 0;
@@ -166,7 +193,30 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
-       td->io_size += f->file_size;
+       return 0;
+}
+
+int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
+{
+       int ret = 0;
+
+       /*
+        * FIXME: add blockdev flushing too
+        */
+       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)
+               ret = 0;
+
+       if (ret < 0) {
+               td_verror(td, errno);
+               return 1;
+       }
+
        return 0;
 }
 
@@ -191,12 +241,8 @@ static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
-       if (td->invalidate_cache) {
-               if (madvise(f->mmap, f->file_size, MADV_DONTNEED) < 0) {
-                       td_verror(td, errno);
-                       return 1;
-               }
-       }
+       if (td->invalidate_cache && file_invalidate_cache(td, f))
+               return 1;
 
        if (td->sequential) {
                if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
@@ -229,12 +275,8 @@ static int setup_files_mmap(struct thread_data *td)
 
 static int __setup_file_plain(struct thread_data *td, struct fio_file *f)
 {
-       if (td->invalidate_cache) {
-               if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED) < 0) {
-                       td_verror(td, errno);
-                       return 1;
-               }
-       }
+       if (td->invalidate_cache && file_invalidate_cache(td, f))
+               return 1;
 
        if (td->sequential) {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
@@ -267,26 +309,8 @@ static int setup_files_plain(struct thread_data *td)
 
 static int setup_file(struct thread_data *td, struct fio_file *f)
 {
-       struct stat st;
        int flags = 0;
 
-       if (stat(f->file_name, &st) == -1) {
-               if (errno != ENOENT) {
-                       td_verror(td, errno);
-                       return 1;
-               }
-               if (!td->create_file) {
-                       td_verror(td, ENOENT);
-                       return 1;
-               }
-               if (create_file(td, f))
-                       return 1;
-       } else if (td->filetype == FIO_TYPE_FILE &&
-                  st.st_size < (off_t) f->file_size) {
-               if (create_file(td, f))
-                       return 1;
-       }
-
        if (td->odirect)
                flags |= OS_O_DIRECT;
 
@@ -338,12 +362,24 @@ int setup_files(struct thread_data *td)
        if (create_files(td))
                return 1;
 
+       err = 0;
        for_each_file(td, f, i) {
                err = setup_file(td, f);
                if (err)
                        break;
        }
 
+       if (err)
+               return err;
+
+       /*
+        * Recalculate the total file size now that files are set up.
+        */
+       td->total_file_size = 0;
+       for_each_file(td, f, i)
+               td->total_file_size += f->file_size;
+
+       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);
@@ -363,12 +399,13 @@ int setup_files(struct thread_data *td)
 
 void close_files(struct thread_data *td)
 {
+       struct fio_file *f;
        int i;
 
-       for (i = 0; i < td->nr_files; i++) {
-               struct fio_file *f = &td->files[i];
-
+       for_each_file(td, f, i) {
                if (f->fd != -1) {
+                       if (td->unlink && td->filetype == FIO_TYPE_FILE)
+                               unlink(f->file_name);
                        close(f->fd);
                        f->fd = -1;
                }