Read stats for backlog verifies not reported for time-expired workloads

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index e0592209a10b12702b9230866a2a6dffe755b137..cb7047c5afe58019809802a0a8cb77e6e400f507 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -143,7 +143,7 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
        if (unlink_file || new_layout) {
                int ret;
 
-               dprint(FD_FILE, "layout %d unlink %d %s\n", new_layout, unlink_file, f->file_name);
+               dprint(FD_FILE, "layout unlink %s\n", f->file_name);
 
                ret = td_io_unlink_file(td, f);
                if (ret != 0 && ret != ENOENT) {
@@ -198,9 +198,6 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-
-       dprint(FD_FILE, "fill file %s, size %llu\n", f->file_name, (unsigned long long) f->real_file_size);
-
        left = f->real_file_size;
        bs = td->o.max_bs[DDIR_WRITE];
        if (bs > left)
@@ -771,7 +768,7 @@ open_again:
                else
                        from_hash = file_lookup_open(f, flags);
        } else if (td_read(td)) {
-               if (f->filetype == FIO_TYPE_CHAR && !read_only)
+               if (td_ioengine_flagged(td, FIO_RO_NEEDS_RW_OPEN) && !read_only)
                        flags |= O_RDWR;
                else
                        flags |= O_RDONLY;
@@ -1081,44 +1078,6 @@ static bool create_work_dirs(struct thread_data *td, const char *fname)
        return true;
 }
 
-int setup_shared_file(struct thread_data *td)
-{
-       struct fio_file *f;
-       uint64_t file_size;
-       int err = 0;
-
-       if (td->o.nr_files > 1) {
-               log_err("fio: shared file setup called for multiple files\n");
-               return -1;
-       }
-
-       get_file_sizes(td);
-
-       f = td->files[0];
-
-       if (f == NULL) {
-               log_err("fio: NULL shared file\n");
-               return -1;
-       }
-
-       file_size = thread_number * td->o.size;
-       dprint(FD_FILE, "shared setup %s real_file_size=%llu, desired=%llu\n", 
-                       f->file_name, (unsigned long long)f->real_file_size, (unsigned long long)file_size);
-
-       if (f->real_file_size < file_size) {
-               dprint(FD_FILE, "fio: extending shared file\n");
-               f->real_file_size = file_size;
-               err = extend_file(td, f);
-               if (!err)
-                       err = __file_invalidate_cache(td, f, 0, f->real_file_size);
-               get_file_sizes(td);
-               dprint(FD_FILE, "shared setup new real_file_size=%llu\n", 
-                               (unsigned long long)f->real_file_size);
-       }
-
-       return err;
-}
-
 /*
  * Open the files and setup files sizes, creating files if necessary.
  */
@@ -1133,7 +1092,7 @@ int setup_files(struct thread_data *td)
        const unsigned long long bs = td_min_bs(td);
        uint64_t fs = 0;
 
-       dprint(FD_FILE, "setup files (thread_number=%d, subjob_number=%d)\n", td->thread_number, td->subjob_number);
+       dprint(FD_FILE, "setup files\n");
 
        old_state = td_bump_runstate(td, TD_SETTING_UP);
 
@@ -1495,7 +1454,7 @@ static void __init_rand_distribution(struct thread_data *td, struct fio_file *f)
 
        seed = jhash(f->file_name, strlen(f->file_name), 0) * td->thread_number;
        if (!td->o.rand_repeatable)
-               seed = td->rand_seeds[4];
+               seed = td->rand_seeds[FIO_RAND_BLOCK_OFF];
 
        if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
                zipf_init(&f->zipf, nranges, td->o.zipf_theta.u.f, td->o.random_center.u.f, seed);