If writing to stdout, move stat output to stderr

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index bd975d82470ce4dc7bedb82a5f1cbd151e5574c1..6ccd357ec4f5d0b9dde6cb92d2691139eeb2aa34 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -181,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) {
@@ -200,8 +200,23 @@ void generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
 
 int generic_open_file(struct thread_data *td, struct fio_file *f)
 {
+       int is_std = 0;
        int flags = 0;
 
+       if (!strcmp(f->file_name, "-")) {
+               if (td_rw(td)) {
+                       log_err("fio: can't read/write to stdin/out\n");
+                       return 1;
+               }
+               is_std = 1;
+
+               /*
+                * move output logging to stderr, if we are writing to stdout
+                */
+               if (td_write(td))
+                       f_out = stderr;
+       }
+
        if (td->o.odirect)
                flags |= OS_O_DIRECT;
        if (td->o.sync_io)
@@ -213,14 +228,20 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
                if (f->filetype == FIO_TYPE_FILE)
                        flags |= O_CREAT;
 
-               f->fd = open(f->file_name, flags, 0600);
+               if (is_std)
+                       f->fd = dup(STDOUT_FILENO);
+               else
+                       f->fd = open(f->file_name, flags, 0600);
        } else {
                if (f->filetype == FIO_TYPE_CHAR)
                        flags |= O_RDWR;
                else
                        flags |= O_RDONLY;
 
-               f->fd = open(f->file_name, flags);
+               if (is_std)
+                       f->fd = dup(STDIN_FILENO);
+               else
+                       f->fd = open(f->file_name, flags);
        }
 
        if (f->fd == -1) {
@@ -478,13 +499,18 @@ static void get_file_type(struct fio_file *f)
 {
        struct stat sb;
 
-       f->filetype = FIO_TYPE_FILE;
+       if (!strcmp(f->file_name, "-"))
+               f->filetype = FIO_TYPE_PIPE;
+       else
+               f->filetype = FIO_TYPE_FILE;
 
        if (!lstat(f->file_name, &sb)) {
                if (S_ISBLK(sb.st_mode))
                        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;
        }
 }