Document file_service_type option

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 4cd62d68a3fae3bd16cecd857b3e0468abbac3be..850dc2f078cd0967703624fc51f6dc2f634dae3f 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,6 +8,30 @@
 #include "fio.h"
 #include "os.h"
 
+int open_file(struct thread_data *td, struct fio_file *f, int flags, int perm)
+{
+       if (flags & O_CREAT)
+               f->fd = open(f->file_name, flags, perm);
+       else
+               f->fd = open(f->file_name, flags);
+
+       if (f->fd != -1) {
+               td->nr_open_files++;
+               return 0;
+       }
+
+       return 1;
+}
+
+void close_file(struct thread_data *td, struct fio_file *f)
+{
+       if (f->fd != -1) {
+               close(f->fd);
+               f->fd = -1;
+               td->nr_open_files--;
+       }
+}
+
 /*
  * Check if the file exists and it's large enough.
  */
@@ -113,8 +137,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;
                        }
@@ -240,11 +263,13 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
         */
        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)
+       else if (td->filetype == FIO_TYPE_FILE) {
+               if (!td->odirect)
+                       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);
+       } else if (td->filetype == FIO_TYPE_CHAR)
                ret = 0;
 
        if (ret < 0) {
@@ -252,7 +277,7 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
-       return 0;
+       return ret;
 }
 
 static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
@@ -279,7 +304,7 @@ static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
        if (td->invalidate_cache && file_invalidate_cache(td, f))
                return 1;
 
-       if (td->sequential) {
+       if (!td_random(td)) {
                if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
                        td_verror(td, errno, "madvise");
                        return 1;
@@ -313,7 +338,7 @@ 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 (td->sequential) {
+       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;
@@ -346,7 +371,7 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 {
        int flags = 0;
 
-       if (td->io_ops->flags & FIO_NETIO)
+       if (td->io_ops->flags & FIO_SELFOPEN)
                return 0;
 
        /*
@@ -371,14 +396,14 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
                                flags |= O_CREAT;
                        }
 
-                       f->fd = open(f->file_name, flags, 0600);
+                       open_file(td, f, flags, 0600);
                } else {
                        if (td->filetype == FIO_TYPE_CHAR)
                                flags |= O_RDWR;
                        else
                                flags |= O_RDONLY;
 
-                       f->fd = open(f->file_name, flags);
+                       open_file(td, f, flags, 0);
                }
        }
 
@@ -387,12 +412,14 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 
                td_verror(td, __e, "open");
                if (__e == EINVAL && td->odirect)
-                       log_err("fio: destinations does not support O_DIRECT\n");
+                       log_err("fio: destination does not support O_DIRECT\n");
                return 1;
        }
 
-       if (get_file_size(td, f))
+       if (get_file_size(td, f)) {
+               close_file(td, f);
                return 1;
+       }
 
        return 0;
 }
@@ -411,12 +438,8 @@ int open_files(struct thread_data *td)
        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)
+               close_file(td, f);
 
        return err;
 }
@@ -464,12 +487,8 @@ int setup_files(struct thread_data *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)
+               close_file(td, f);
 
        return err;
 }
@@ -486,10 +505,9 @@ 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;
-               }
+
+               close_file(td, f);
+
                if (f->mmap) {
                        munmap(f->mmap, f->file_size);
                        f->mmap = NULL;