Add version 2 of the iolog format

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index bb25cd5c20bf43ea46646f3b5fb799637e23f5f2..7a9a2afed29b34d345e1628156c2d3ac6848163c 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -200,27 +200,48 @@ 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)
                flags |= O_SYNC;
 
-       if (td_write(td) || td_rw(td)) {
+       if (td_write(td)) {
                flags |= O_RDWR;
 
                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) {
@@ -453,8 +474,7 @@ void close_files(struct thread_data *td)
        unsigned int i;
 
        for_each_file(td, f, i) {
-               if ((f->flags & FIO_FILE_UNLINK) &&
-                   f->filetype == FIO_TYPE_FILE)
+               if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
                        unlink(f->file_name);
 
                td_io_close_file(td, f);
@@ -478,7 +498,10 @@ 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))
@@ -490,7 +513,7 @@ static void get_file_type(struct fio_file *f)
        }
 }
 
-void add_file(struct thread_data *td, const char *fname)
+int add_file(struct thread_data *td, const char *fname)
 {
        int cur_files = td->files_index;
        char file_name[PATH_MAX];
@@ -520,10 +543,13 @@ void add_file(struct thread_data *td, const char *fname)
        td->files_index++;
        if (f->filetype == FIO_TYPE_FILE)
                td->nr_normal_files++;
+
+       return cur_files;
 }
 
 void get_file(struct fio_file *f)
 {
+       assert(f->flags & FIO_FILE_OPEN);
        f->references++;
 }
 
@@ -621,3 +647,28 @@ void dup_files(struct thread_data *td, struct thread_data *org)
                        f->file_name = strdup(f->file_name);
        }
 }
+
+/*
+ * Returns the index that matches the filename, or -1 if not there
+ */
+int get_fileno(struct thread_data *td, const char *fname)
+{
+       struct fio_file *f;
+       unsigned int i;
+
+       for_each_file(td, f, i)
+               if (!strcmp(f->file_name, fname))
+                       return i;
+
+       return -1;
+}
+
+/*
+ * For log usage, where we add/open/close files automatically
+ */
+void free_release_files(struct thread_data *td)
+{
+       close_files(td);
+       td->files_index = 0;
+       td->nr_normal_files = 0;
+}