splice: update to new vmsplice-to-user interface

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index b8b22b5a54da51504b369b67975c46ef10f95084..ff1385cdd02675f252b68502b4d59badd022d7d1 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -104,7 +104,7 @@ static unsigned long long get_rand_file_size(struct thread_data *td)
        long r;
 
        r = os_random_long(&td->file_size_state);
-       ret = td->o.file_size_low + (unsigned long long) ((double) td->o.file_size_high * (r / (RAND_MAX + 1.0)));
+       ret = td->o.file_size_low + (unsigned long long) ((double) (td->o.file_size_high - td->o.file_size_low) * (r / (RAND_MAX + 1.0)));
        ret -= (ret % td->o.rw_min_bs);
        return ret;
 }
@@ -431,7 +431,7 @@ int setup_files(struct thread_data *td)
         */
        if (need_extend) {
                temp_stall_ts = 1;
-               log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+               log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
                        td->o.name, need_extend, extend_size >> 20);
 
                for_each_file(td, f, i) {
@@ -454,7 +454,12 @@ int setup_files(struct thread_data *td)
        if (!td->o.zone_size)
                td->o.zone_size = td->o.size;
 
-       td->total_io_size = td->o.size * td->o.loops;
+       /*
+        * iolog already set the total io size, if we read back
+        * stored entries.
+        */
+       if (!td->o.read_iolog_file)
+               td->total_io_size = td->o.size * td->o.loops;
        return 0;
 err_offset:
        log_err("%s: you need to specify valid offset=\n", td->o.name);