[PATCH] Total io size / eta fix

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 04052bf368e6a0ebd2fb17e9af1e1c57fcf13f4b..327eb5ac8cf4dcab676f888cc9b2c663d791166d 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -86,7 +86,6 @@ static int create_files(struct thread_data *td)
         * 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;
 
@@ -109,10 +108,9 @@ static int create_files(struct thread_data *td)
                err = create_file(td, f);
                if (err)
                        break;
-
-               td->io_size += f->file_size;
        }
 
+       td->io_size = td->total_file_size;
        temp_stall_ts = 0;
        return err;
 }
@@ -179,7 +177,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;
 }
 
@@ -204,12 +225,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) {
@@ -242,12 +259,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) {
@@ -358,11 +371,10 @@ 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);