Add weak helpers to other makefiles

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 15c431603718291d04b3ab50cf623ea6c83b80c7..70589aa513eaa95d6108664df88d43270d8ba475 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -156,6 +156,9 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
        unsigned int bs;
        char *b;
 
+       if (td->io_ops->flags & FIO_PIPEIO)
+               return 0;
+
        if (!fio_file_open(f)) {
                if (td->io_ops->open_file(td, f)) {
                        log_err("fio: cannot pre-read, failed to open file\n");
@@ -300,9 +303,12 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        /*
         * FIXME: add blockdev flushing too
         */
-       if (f->mmap_ptr)
+       if (f->mmap_ptr) {
                ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED);
-       else if (f->filetype == FIO_TYPE_FILE) {
+#ifdef FIO_MADV_FREE
+               (void) madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE);
+#endif
+       } else if (f->filetype == FIO_TYPE_FILE) {
                ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
        } else if (f->filetype == FIO_TYPE_BD) {
                ret = blockdev_invalidate_cache(f->fd);
@@ -436,7 +442,7 @@ open_again:
                char buf[FIO_VERROR_SIZE];
                int __e = errno;
 
-               if (errno == EPERM && (flags & FIO_O_NOATIME)) {
+               if (__e == EPERM && (flags & FIO_O_NOATIME)) {
                        flags &= ~FIO_O_NOATIME;
                        goto open_again;
                }
@@ -608,7 +614,7 @@ int setup_files(struct thread_data *td)
                temp_stall_ts = 1;
                if (!terse_output)
                        log_info("%s: Laying out IO file(s) (%u file(s) /"
-                                " %LuMiB)\n", td->o.name, need_extend,
+                                " %LuMB)\n", td->o.name, need_extend,
                                        extend_size >> 20);
 
                for_each_file(td, f, i) {
@@ -621,7 +627,8 @@ int setup_files(struct thread_data *td)
                        fio_file_clear_extend(f);
                        if (!td->o.fill_device) {
                                old_len = f->real_file_size;
-                               extend_len = f->io_size + f->file_offset - old_len;
+                               extend_len = f->io_size + f->file_offset -
+                                               old_len;
                        }
                        f->real_file_size = (f->io_size + f->file_offset);
                        err = extend_file(td, f);
@@ -710,8 +717,10 @@ void close_files(struct thread_data *td)
        struct fio_file *f;
        unsigned int i;
 
-       for_each_file(td, f, i)
-               td_io_close_file(td, f);
+       for_each_file(td, f, i) {
+               if (fio_file_open(f))
+                       td_io_close_file(td, f);
+       }
 }
 
 void close_and_free_files(struct thread_data *td)
@@ -782,7 +791,7 @@ int add_file(struct thread_data *td, const char *fname)
                log_err("fio: smalloc OOM\n");
                assert(0);
        }
-               
+
        f->fd = -1;
 
        if (td->files_size <= td->files_index) {
@@ -810,7 +819,7 @@ int add_file(struct thread_data *td, const char *fname)
                log_err("fio: smalloc OOM\n");
                assert(0);
        }
-       
+
        get_file_type(f);
 
        switch (td->o.file_lock_mode) {
@@ -1011,14 +1020,14 @@ void dup_files(struct thread_data *td, struct thread_data *org)
                        assert(0);
                }
                __f->fd = -1;
-       
+
                if (f->file_name) {
                        __f->file_name = smalloc_strdup(f->file_name);
                        if (!__f->file_name) {
                                log_err("fio: smalloc OOM\n");
                                assert(0);
                        }
-       
+
                        __f->filetype = f->filetype;
                }