filesetup: assign fileno at setup time

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 881aeee8f8bf2b94649046181d9892d7050face8..3fc14641ed7d34380d5f735006eb129ab0b7faf0 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -264,7 +264,7 @@ error:
        return ret;
 }
 
-static unsigned long long get_rand_file_size(struct thread_data *td)
+unsigned long long get_rand_file_size(struct thread_data *td)
 {
        unsigned long long ret, sized;
        uint64_t frand_max;
@@ -391,7 +391,7 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
                                   unsigned long long off,
                                   unsigned long long len)
 {
-       int ret = 0;
+       int errval = 0, ret = 0;
 
 #ifdef CONFIG_ESX
        return 0;
@@ -408,12 +408,28 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
        dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
                                                                len);
 
-       if (td->io_ops->invalidate)
+       if (td->io_ops->invalidate) {
                ret = td->io_ops->invalidate(td, f);
-       else if (f->filetype == FIO_TYPE_FILE)
+               if (ret < 0)
+                       errval = ret;
+       } else if (f->filetype == FIO_TYPE_FILE) {
                ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
-       else if (f->filetype == FIO_TYPE_BD) {
+               if (ret)
+                       errval = ret;
+       } else if (f->filetype == FIO_TYPE_BD) {
+               int retry_count = 0;
+
                ret = blockdev_invalidate_cache(f);
+               while (ret < 0 && errno == EAGAIN && retry_count++ < 25) {
+                       /*
+                        * Linux multipath devices reject ioctl while
+                        * the maps are being updated. That window can
+                        * last tens of milliseconds; we'll try up to
+                        * a quarter of a second.
+                        */
+                       usleep(10000);
+                       ret = blockdev_invalidate_cache(f);
+               }
                if (ret < 0 && errno == EACCES && geteuid()) {
                        if (!root_warn) {
                                log_err("fio: only root may flush block "
@@ -422,6 +438,8 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
                        }
                        ret = 0;
                }
+               if (ret < 0)
+                       errval = errno;
        } else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE)
                ret = 0;
 
@@ -431,10 +449,8 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
         * function to flush eg block device caches. So just warn and
         * continue on our way.
         */
-       if (ret) {
-               log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errno));
-               ret = 0;
-       }
+       if (errval)
+               log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errval));
 
        return 0;
 
@@ -793,6 +809,7 @@ int setup_files(struct thread_data *td)
         */
        total_size = 0;
        for_each_file(td, f, i) {
+               f->fileno = i;
                if (f->real_file_size == -1ULL)
                        total_size = -1ULL;
                else
@@ -905,7 +922,7 @@ int setup_files(struct thread_data *td)
                }
 
                td->ts.nr_block_infos = len;
-               for (int i = 0; i < len; i++)
+               for (i = 0; i < len; i++)
                        td->ts.block_infos[i] =
                                BLOCK_INFO(0, BLOCK_STATE_UNINIT);
        } else
@@ -924,7 +941,7 @@ int setup_files(struct thread_data *td)
         */
        if (need_extend) {
                temp_stall_ts = 1;
-               if (output_format == FIO_OUTPUT_NORMAL)
+               if (output_format & FIO_OUTPUT_NORMAL)
                        log_info("%s: Laying out IO file(s) (%u file(s) /"
                                 " %lluMB)\n", o->name, need_extend,
                                        extend_size >> 20);