Add check for pipe/fifo files

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 2da29d1510ad2ed5cccba9d6d38ccd7d15322ec8..bb25cd5c20bf43ea46646f3b5fb799637e23f5f2 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,11 +8,10 @@
 #include <sys/types.h>
 
 #include "fio.h"
-#include "os.h"
 
 static int extend_file(struct thread_data *td, struct fio_file *f)
 {
-       int r, new_layout = 0, flags;
+       int r, new_layout = 0, unlink_file = 0, flags;
        unsigned long long left;
        unsigned int bs;
        char *b;
@@ -24,8 +23,10 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
         */
        if (td_read(td) || (td_write(td) && td->o.overwrite))
                new_layout = 1;
+       if (td_write(td) && !td->o.overwrite)
+               unlink_file = 1;
 
-       if (new_layout && (f->flags & FIO_FILE_EXISTS)) {
+       if ((unlink_file || new_layout) && (f->flags & FIO_FILE_EXISTS)) {
                if (unlink(f->file_name) < 0) {
                        td_verror(td, errno, "unlink");
                        return 1;
@@ -47,14 +48,14 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                goto err;
        }
 
+       if (!new_layout)
+               goto done;
+
        if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
                td_verror(td, errno, "posix_fallocate");
                goto err;
        }
 
-       if (!new_layout)
-               goto done;
-
        b = malloc(td->o.max_bs[DDIR_WRITE]);
        memset(b, 0, td->o.max_bs[DDIR_WRITE]);
 
@@ -138,6 +139,9 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
        int ret = 0;
 
+       if (f->flags & FIO_SIZE_KNOWN)
+               return 0;
+
        if (f->filetype == FIO_TYPE_FILE)
                ret = file_size(td, f);
        else if (f->filetype == FIO_TYPE_BD)
@@ -153,6 +157,7 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
+       f->flags |= FIO_SIZE_KNOWN;
        return 0;
 }
 
@@ -176,7 +181,7 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
                        log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
                        ret = 0;
                }
-       } else if (f->filetype == FIO_TYPE_CHAR)
+       } else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE)
                ret = 0;
 
        if (ret < 0) {
@@ -244,8 +249,15 @@ int open_files(struct thread_data *td)
 
        for_each_file(td, f, i) {
                err = td_io_open_file(td, f);
-               if (err)
+               if (err) {
+                       if (td->error == EMFILE) {
+                               log_err("fio: limited open files to: %d\n", td->nr_open_files);
+                               td->o.open_files = td->nr_open_files;
+                               err = 0;
+                               clear_error(td);
+                       }
                        break;
+               }
 
                if (td->o.open_files == td->nr_open_files)
                        break;
@@ -270,15 +282,19 @@ static int get_file_sizes(struct thread_data *td)
        int err = 0;
 
        for_each_file(td, f, i) {
-               err = td->io_ops->open_file(td, f);
-               if (err) {
-                       td->error = 0;
-                       memset(td->verror, 0, sizeof(td->verror));
-                       err = 0;
-                       continue;
+               if (td->io_ops->open_file(td, f)) {
+                       if (td->error != ENOENT) {
+                               log_err("%s\n", td->verror);
+                               err = 1;
+                       }
+                       clear_error(td);
+               } else {
+                       if (td->io_ops->close_file)
+                               td->io_ops->close_file(td, f);
                }
 
-               td->io_ops->close_file(td, f);
+               if (f->real_file_size == -1ULL && td->o.size)
+                       f->real_file_size = td->o.size / td->o.nr_files;
        }
 
        return err;
@@ -292,7 +308,7 @@ int setup_files(struct thread_data *td)
        unsigned long long total_size, extend_size;
        struct fio_file *f;
        unsigned int i;
-       int err, need_extend;
+       int err = 0, need_extend;
 
        /*
         * if ioengine defines a setup() method, it's responsible for
@@ -322,7 +338,7 @@ int setup_files(struct thread_data *td)
        /*
         * device/file sizes are zero and no size given, punt
         */
-       if (!total_size && !td->o.size) {
+       if ((!total_size || total_size == -1ULL) && !td->o.size) {
                log_err("%s: you need to specify size=\n", td->o.name);
                td_verror(td, EINVAL, "total_file_size");
                return 1;
@@ -387,6 +403,7 @@ int setup_files(struct thread_data *td)
                        if (!(f->flags & FIO_FILE_EXTEND))
                                continue;
 
+                       assert(f->filetype == FIO_TYPE_FILE);
                        f->flags &= ~FIO_FILE_EXTEND;
                        f->real_file_size = f->io_size;
                        err = extend_file(td, f);
@@ -468,6 +485,8 @@ static void get_file_type(struct fio_file *f)
                        f->filetype = FIO_TYPE_BD;
                else if (S_ISCHR(sb.st_mode))
                        f->filetype = FIO_TYPE_CHAR;
+               else if (S_ISFIFO(sb.st_mode))
+                       f->filetype = FIO_TYPE_PIPE;
        }
 }
 
@@ -484,6 +503,12 @@ void add_file(struct thread_data *td, const char *fname)
        memset(f, 0, sizeof(*f));
        f->fd = -1;
 
+       /*
+        * init function, io engine may not be loaded yet
+        */
+       if (td->io_ops && (td->io_ops->flags & FIO_DISKLESSIO))
+               f->real_file_size = -1ULL;
+
        if (td->o.directory)
                len = sprintf(file_name, "%s/", td->o.directory);
 
@@ -516,6 +541,7 @@ void put_file(struct thread_data *td, struct fio_file *f)
 
        if (td->io_ops->close_file)
                td->io_ops->close_file(td, f);
+
        td->nr_open_files--;
        f->flags &= ~FIO_FILE_OPEN;
 }
@@ -528,7 +554,10 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
        D = opendir(dirname);
        if (!D) {
-               td_verror(td, errno, "opendir");
+               char buf[FIO_VERROR_SIZE];
+
+               snprintf(buf, FIO_VERROR_SIZE - 1, "opendir(%s)", dirname);
+               td_verror(td, errno, buf);
                return 1;
        }
 
@@ -553,6 +582,8 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
                        td->o.nr_files++;
                        continue;
                }
+               if (!S_ISDIR(sb.st_mode))
+                       continue;
 
                if ((ret = recurse_dir(td, full_path)) != 0)
                        break;
@@ -564,7 +595,12 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
 int add_dir_files(struct thread_data *td, const char *path)
 {
-       return recurse_dir(td, path);
+       int ret = recurse_dir(td, path);
+
+       if (!ret)
+               log_info("fio: opendir added %d files\n", td->o.nr_files);
+
+       return ret;
 }
 
 void dup_files(struct thread_data *td, struct thread_data *org)