Use unique seed for zipf/pareto init if rand_repeat is not set

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 6277f0f40cd33d24f7ddd566f142ebb81f291d2e..c488eb471caa8a2d442c8cf58a1c203ff18309e7 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -12,6 +12,7 @@
 #include "smalloc.h"
 #include "filehash.h"
 #include "os/os.h"
+#include "hash.h"
 
 #ifdef FIO_HAVE_LINUX_FALLOCATE
 #include <linux/falloc.h>
@@ -435,7 +436,7 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
        return ret;
 }
 
-static int file_lookup_open(struct fio_file *f, int flags)
+int file_lookup_open(struct fio_file *f, int flags)
 {
        struct fio_file *__f;
        int from_hash;
@@ -468,6 +469,11 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 
        dprint(FD_FILE, "fd open %s\n", f->file_name);
 
+       if (td_trim(td) && f->filetype != FIO_TYPE_BD) {
+               log_err("fio: trim only applies to block device\n");
+               return 1;
+       }
+
        if (!strcmp(f->file_name, "-")) {
                if (td_rw(td)) {
                        log_err("fio: can't read/write to stdin/out\n");
@@ -482,14 +488,17 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
                        f_out = stderr;
        }
 
+       if (td_trim(td))
+               goto skip_flags;
        if (td->o.odirect)
                flags |= OS_O_DIRECT;
        if (td->o.sync_io)
                flags |= O_SYNC;
-       if (f->filetype != FIO_TYPE_FILE)
-               flags |= FIO_O_NOATIME;
        if (td->o.create_on_open)
                flags |= O_CREAT;
+skip_flags:
+       if (f->filetype != FIO_TYPE_FILE)
+               flags |= FIO_O_NOATIME;
 
 open_again:
        if (td_write(td)) {
@@ -503,7 +512,7 @@ open_again:
                        f->fd = dup(STDOUT_FILENO);
                else
                        from_hash = file_lookup_open(f, flags);
-       } else {
+       } else if (td_read(td)) {
                if (f->filetype == FIO_TYPE_CHAR && !read_only)
                        flags |= O_RDWR;
                else
@@ -513,6 +522,9 @@ open_again:
                        f->fd = dup(STDIN_FILENO);
                else
                        from_hash = file_lookup_open(f, flags);
+       } else { //td trim
+               flags |= O_RDWR;
+               from_hash = file_lookup_open(f, flags);
        }
 
        if (f->fd == -1) {
@@ -657,6 +669,12 @@ static unsigned long long get_fs_free_counts(struct thread_data *td)
        return ret;
 }
 
+unsigned long long get_start_offset(struct thread_data *td)
+{
+       return td->o.start_offset +
+               (td->thread_number - 1) * td->o.offset_increment;
+}
+
 /*
  * Open the files and setup files sizes, creating files if necessary.
  */
@@ -718,8 +736,7 @@ int setup_files(struct thread_data *td)
        extend_size = total_size = 0;
        need_extend = 0;
        for_each_file(td, f, i) {
-               f->file_offset = td->o.start_offset +
-                       (td->thread_number - 1) * td->o.offset_increment;
+               f->file_offset = get_start_offset(td);
 
                if (!td->o.file_size_low) {
                        /*
@@ -750,8 +767,11 @@ int setup_files(struct thread_data *td)
 
                if (f->io_size == -1ULL)
                        total_size = -1ULL;
-               else
+               else {
+                        if (td->o.size_percent)
+                                f->io_size = (f->io_size * td->o.size_percent) / 100;
                        total_size += f->io_size;
+               }
 
                if (f->filetype == FIO_TYPE_FILE &&
                    (f->io_size + f->file_offset) > f->real_file_size &&
@@ -765,9 +785,6 @@ int setup_files(struct thread_data *td)
                }
        }
 
-       if (td->o.size_percent)
-               total_size = (total_size * td->o.size_percent) / 100;
-
        if (!td->o.size || td->o.size > total_size)
                td->o.size = total_size;
 
@@ -776,7 +793,7 @@ int setup_files(struct thread_data *td)
         */
        if (need_extend) {
                temp_stall_ts = 1;
-               if (!terse_output)
+               if (output_format == FIO_OUTPUT_NORMAL)
                        log_info("%s: Laying out IO file(s) (%u file(s) /"
                                 " %lluMB)\n", td->o.name, need_extend,
                                        extend_size >> 20);
@@ -846,12 +863,53 @@ int pre_read_files(struct thread_data *td)
        return 1;
 }
 
+static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)
+{
+       unsigned int range_size, seed;
+       unsigned long nranges;
+
+       range_size = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]);
+
+       nranges = (f->real_file_size + range_size - 1) / range_size;
+
+       seed = jhash(f->file_name, strlen(f->file_name), 0) * td->thread_number;
+       if (!td->o.rand_repeatable)
+               seed = td->rand_seeds[4];
+
+       if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
+               zipf_init(&f->zipf, nranges, td->o.zipf_theta, seed);
+       else
+               pareto_init(&f->zipf, nranges, td->o.pareto_h, seed);
+
+       return 1;
+}
+
+static int init_rand_distribution(struct thread_data *td)
+{
+       struct fio_file *f;
+       unsigned int i;
+       int state;
+
+       if (td->o.random_distribution == FIO_RAND_DIST_RANDOM)
+               return 0;
+
+       state = td->runstate;
+       td_set_runstate(td, TD_SETTING_UP);
+       for_each_file(td, f, i)
+               __init_rand_distribution(td, f);
+       td_set_runstate(td, state);
+
+       return 1;
+}
+
 int init_random_map(struct thread_data *td)
 {
        unsigned long long blocks, num_maps;
        struct fio_file *f;
        unsigned int i;
 
+       if (init_rand_distribution(td))
+               return 0;
        if (td->o.norandommap || !td_random(td))
                return 0;