Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index adfe940d1a0b89e1a09d7353dcea2ab28ab73b8c..57735a96dacffe0e798b733b64f7f2dd187d97b2 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -12,9 +12,21 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 {
        unsigned long long left;
        unsigned int bs;
+       struct stat st;
        char *b;
        int r;
 
+       if (td->filetype != FIO_TYPE_FILE)
+               return 0;
+
+       if (stat(f->file_name, &st) == -1) {
+               if (!td->create_file) {
+                       td_verror(td, ENOENT);
+                       return 1;
+               }
+       } else if (st.st_size >= (off_t) f->file_size)
+               return 0;
+
        f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
        if (f->fd < 0) {
                td_verror(td, errno);
@@ -95,6 +107,7 @@ static int create_files(struct thread_data *td)
        for_each_file(td, f, i) {
                f->file_size = td->total_file_size / td->nr_files;
                err = create_file(td, f);
+               if (err)
                        break;
 
                td->io_size += f->file_size;
@@ -170,6 +183,30 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
        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;
+}
+
 static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
 {
        int flags;
@@ -191,12 +228,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 +262,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 +296,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;
 
@@ -363,12 +374,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;
                }