Fix typo (READ/DDIR_READ).
[fio.git] / io_u.c
diff --git a/io_u.c b/io_u.c
index 9ab33f39da6cec4eb2fb2ae3c29e961660020438..3de04ef0eb91fe25d6561562f931ebfa7fb311f7 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -6,31 +6,27 @@
 #include <assert.h>
 
 #include "fio.h"
-
-/*
- * Change this define to play with the timeout handling
- */
-#undef FIO_USE_TIMEOUT
+#include "hash.h"
+#include "verify.h"
+#include "trim.h"
+#include "lib/rand.h"
+#include "lib/axmap.h"
 
 struct io_completion_data {
        int nr;                         /* input */
 
        int error;                      /* output */
-       unsigned long bytes_done[2];    /* output */
+       unsigned long bytes_done[DDIR_RWDIR_CNT];       /* output */
        struct timeval time;            /* output */
 };
 
 /*
- * The ->file_map[] contains a map of blocks we have or have not done io
+ * The ->io_axmap contains a map of blocks we have or have not done io
  * to yet. Used to make sure we cover the entire range in a fair fashion.
  */
-static int random_map_free(struct thread_data *td, struct fio_file *f,
-                          unsigned long long block)
+static int random_map_free(struct fio_file *f, const uint64_t block)
 {
-       unsigned int idx = RAND_MAP_IDX(td, f, block);
-       unsigned int bit = RAND_MAP_BIT(td, f, block);
-
-       return (f->file_map[idx] & (1UL << bit)) == 0;
+       return !axmap_isset(f->io_axmap, block);
 }
 
 /*
@@ -40,122 +36,276 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 {
        unsigned int min_bs = td->o.rw_min_bs;
        struct fio_file *f = io_u->file;
-       unsigned long long block;
-       unsigned int blocks;
        unsigned int nr_blocks;
+       uint64_t block;
 
-       block = (io_u->offset - f->file_offset) / (unsigned long long) min_bs;
-       blocks = 0;
+       block = (io_u->offset - f->file_offset) / (uint64_t) min_bs;
        nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
 
-       while (blocks < nr_blocks) {
-               unsigned int idx, bit;
+       if (!(io_u->flags & IO_U_F_BUSY_OK))
+               nr_blocks = axmap_set_nr(f->io_axmap, block, nr_blocks);
 
-               /*
-                * If we have a mixed random workload, we may
-                * encounter blocks we already did IO to.
-                */
-               if ((td->o.ddir_nr == 1) && !random_map_free(td, f, block))
-                       break;
-
-               idx = RAND_MAP_IDX(td, f, block);
-               bit = RAND_MAP_BIT(td, f, block);
+       if ((nr_blocks * min_bs) < io_u->buflen)
+               io_u->buflen = nr_blocks * min_bs;
+}
 
-               fio_assert(td, idx < f->num_maps);
+static uint64_t last_block(struct thread_data *td, struct fio_file *f,
+                          enum fio_ddir ddir)
+{
+       uint64_t max_blocks;
+       uint64_t max_size;
 
-               f->file_map[idx] |= (1UL << bit);
-               block++;
-               blocks++;
-       }
+       assert(ddir_rw(ddir));
 
-       if ((blocks * min_bs) < io_u->buflen)
-               io_u->buflen = blocks * min_bs;
-}
+       /*
+        * Hmm, should we make sure that ->io_size <= ->real_file_size?
+        */
+       max_size = f->io_size;
+       if (max_size > f->real_file_size)
+               max_size = f->real_file_size;
 
-static inline unsigned long long last_block(struct thread_data *td,
-                                           struct fio_file *f,
-                                           enum fio_ddir ddir)
-{
-       unsigned long long max_blocks;
+       if (td->o.zone_range)
+               max_size = td->o.zone_range;
 
-       max_blocks = f->io_size / td->o.min_bs[ddir];
+       max_blocks = max_size / (uint64_t) td->o.ba[ddir];
        if (!max_blocks)
                return 0;
 
-       return max_blocks - 1;
+       return max_blocks;
 }
 
-/*
- * Return the next free block in the map.
- */
-static int get_next_free_block(struct thread_data *td, struct fio_file *f,
-                              enum fio_ddir ddir, unsigned long long *b)
+struct rand_off {
+       struct flist_head list;
+       uint64_t off;
+};
+
+static int __get_next_rand_offset(struct thread_data *td, struct fio_file *f,
+                                 enum fio_ddir ddir, uint64_t *b)
 {
-       int i;
+       uint64_t r, lastb;
 
-       i = f->last_free_lookup;
-       *b = (i * BLOCKS_PER_MAP);
-       while ((*b) * td->o.rw_min_bs < f->real_file_size) {
-               if (f->file_map[i] != -1UL) {
-                       *b += fio_ffz(f->file_map[i]);
-                       if (*b > last_block(td, f, ddir))
-                               break;
-                       f->last_free_lookup = i;
-                       return 0;
+       lastb = last_block(td, f, ddir);
+       if (!lastb)
+               return 1;
+
+       if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE) {
+               uint64_t rmax;
+
+               rmax = td->o.use_os_rand ? OS_RAND_MAX : FRAND_MAX;
+
+               if (td->o.use_os_rand) {
+                       rmax = OS_RAND_MAX;
+                       r = os_random_long(&td->random_state);
+               } else {
+                       rmax = FRAND_MAX;
+                       r = __rand(&td->__random_state);
                }
 
-               *b += BLOCKS_PER_MAP;
-               i++;
+               dprint(FD_RANDOM, "off rand %llu\n", r);
+
+               *b = (lastb - 1) * (r / ((uint64_t) rmax + 1.0));
+       } else {
+               uint64_t off = 0;
+
+               if (lfsr_next(&f->lfsr, &off, lastb))
+                       return 1;
+
+               *b = off;
        }
 
-       dprint(FD_IO, "failed finding a free block\n");
-       return 1;
+       /*
+        * if we are not maintaining a random map, we are done.
+        */
+       if (!file_randommap(td, f))
+               goto ret;
+
+       /*
+        * calculate map offset and check if it's free
+        */
+       if (random_map_free(f, *b))
+               goto ret;
+
+       dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n", *b);
+
+       *b = axmap_next_free(f->io_axmap, *b);
+       if (*b == (uint64_t) -1ULL)
+               return 1;
+ret:
+       return 0;
 }
 
-static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
-                               enum fio_ddir ddir, unsigned long long *b)
+static int __get_next_rand_offset_zipf(struct thread_data *td,
+                                      struct fio_file *f, enum fio_ddir ddir,
+                                      uint64_t *b)
 {
-       unsigned long long r, rb;
-       int loops = 5;
+       *b = zipf_next(&f->zipf);
+       return 0;
+}
 
-       do {
-               r = os_random_long(&td->random_state);
-               *b = last_block(td, f, ddir);
+static int __get_next_rand_offset_pareto(struct thread_data *td,
+                                        struct fio_file *f, enum fio_ddir ddir,
+                                        uint64_t *b)
+{
+       *b = pareto_next(&f->zipf);
+       return 0;
+}
 
-               /*
-                * if we are not maintaining a random map, we are done.
-                */
-               if (td->o.norandommap)
-                       return 0;
+static int flist_cmp(void *data, struct flist_head *a, struct flist_head *b)
+{
+       struct rand_off *r1 = flist_entry(a, struct rand_off, list);
+       struct rand_off *r2 = flist_entry(b, struct rand_off, list);
 
-               /*
-                * calculate map offset and chec if it's free
-                */
-               rb = *b;
-               if (random_map_free(td, f, rb))
-                       return 0;
+       return r1->off - r2->off;
+}
 
-       } while (--loops);
+static int get_off_from_method(struct thread_data *td, struct fio_file *f,
+                              enum fio_ddir ddir, uint64_t *b)
+{
+       if (td->o.random_distribution == FIO_RAND_DIST_RANDOM)
+               return __get_next_rand_offset(td, f, ddir, b);
+       else if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
+               return __get_next_rand_offset_zipf(td, f, ddir, b);
+       else if (td->o.random_distribution == FIO_RAND_DIST_PARETO)
+               return __get_next_rand_offset_pareto(td, f, ddir, b);
+
+       log_err("fio: unknown random distribution: %d\n", td->o.random_distribution);
+       return 1;
+}
+
+static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
+                               enum fio_ddir ddir, uint64_t *b)
+{
+       struct rand_off *r;
+       int i, ret = 1;
 
        /*
-        * we get here, if we didn't suceed in looking up a block. generate
-        * a random start offset into the filemap, and find the first free
-        * block from there.
+        * If sort not enabled, or not a pure random read workload without
+        * any stored write metadata, just return a random offset
         */
-       loops = 10;
-       do {
-               f->last_free_lookup = (f->num_maps - 1) * (r / (RAND_MAX+1.0));
-               if (!get_next_free_block(td, f, ddir, b))
+       if (!td->o.verifysort_nr || !(ddir == DDIR_READ && td->o.do_verify &&
+           td->o.verify != VERIFY_NONE && td_random(td)))
+               return get_off_from_method(td, f, ddir, b);
+
+       if (!flist_empty(&td->next_rand_list)) {
+               struct rand_off *r;
+fetch:
+               r = flist_entry(td->next_rand_list.next, struct rand_off, list);
+               flist_del(&r->list);
+               *b = r->off;
+               free(r);
+               return 0;
+       }
+
+       for (i = 0; i < td->o.verifysort_nr; i++) {
+               r = malloc(sizeof(*r));
+
+               ret = get_off_from_method(td, f, ddir, &r->off);
+               if (ret) {
+                       free(r);
+                       break;
+               }
+
+               flist_add(&r->list, &td->next_rand_list);
+       }
+
+       if (ret && !i)
+               return ret;
+
+       assert(!flist_empty(&td->next_rand_list));
+       flist_sort(NULL, &td->next_rand_list, flist_cmp);
+       goto fetch;
+}
+
+static int get_next_rand_block(struct thread_data *td, struct fio_file *f,
+                              enum fio_ddir ddir, uint64_t *b)
+{
+       if (!get_next_rand_offset(td, f, ddir, b))
+               return 0;
+
+       if (td->o.time_based) {
+               fio_file_reset(f);
+               if (!get_next_rand_offset(td, f, ddir, b))
                        return 0;
+       }
 
-               r = os_random_long(&td->random_state);
-       } while (--loops);
+       dprint(FD_IO, "%s: rand offset failed, last=%llu, size=%llu\n",
+                       f->file_name, f->last_pos, f->real_file_size);
+       return 1;
+}
 
-       /*
-        * that didn't work either, try exhaustive search from the start
-        */
-       f->last_free_lookup = 0;
-       return get_next_free_block(td, f, ddir, b);
+static int get_next_seq_offset(struct thread_data *td, struct fio_file *f,
+                              enum fio_ddir ddir, uint64_t *offset)
+{
+       assert(ddir_rw(ddir));
+
+       if (f->last_pos >= f->io_size + get_start_offset(td) && td->o.time_based)
+               f->last_pos = f->last_pos - f->io_size;
+
+       if (f->last_pos < f->real_file_size) {
+               uint64_t pos;
+
+               if (f->last_pos == f->file_offset && td->o.ddir_seq_add < 0)
+                       f->last_pos = f->real_file_size;
+
+               pos = f->last_pos - f->file_offset;
+               if (pos)
+                       pos += td->o.ddir_seq_add;
+
+               *offset = pos;
+               return 0;
+       }
+
+       return 1;
+}
+
+static int get_next_block(struct thread_data *td, struct io_u *io_u,
+                         enum fio_ddir ddir, int rw_seq)
+{
+       struct fio_file *f = io_u->file;
+       uint64_t b, offset;
+       int ret;
+
+       assert(ddir_rw(ddir));
+
+       b = offset = -1ULL;
+
+       if (rw_seq) {
+               if (td_random(td))
+                       ret = get_next_rand_block(td, f, ddir, &b);
+               else
+                       ret = get_next_seq_offset(td, f, ddir, &offset);
+       } else {
+               io_u->flags |= IO_U_F_BUSY_OK;
+
+               if (td->o.rw_seq == RW_SEQ_SEQ) {
+                       ret = get_next_seq_offset(td, f, ddir, &offset);
+                       if (ret)
+                               ret = get_next_rand_block(td, f, ddir, &b);
+               } else if (td->o.rw_seq == RW_SEQ_IDENT) {
+                       if (f->last_start != -1ULL)
+                               offset = f->last_start - f->file_offset;
+                       else
+                               offset = 0;
+                       ret = 0;
+               } else {
+                       log_err("fio: unknown rw_seq=%d\n", td->o.rw_seq);
+                       ret = 1;
+               }
+       }
+
+       if (!ret) {
+               if (offset != -1ULL)
+                       io_u->offset = offset;
+               else if (b != -1ULL)
+                       io_u->offset = b * td->o.ba[ddir];
+               else {
+                       log_err("fio: bug in offset generation: offset=%llu, b=%llu\n",
+                                                               offset, b);
+                       ret = 1;
+               }
+       }
+
+       return ret;
 }
 
 /*
@@ -163,27 +313,29 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
  * until we find a free one. For sequential io, just return the end of
  * the last io issued.
  */
-static int get_next_offset(struct thread_data *td, struct io_u *io_u)
+static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       unsigned long long b;
        enum fio_ddir ddir = io_u->ddir;
+       int rw_seq_hit = 0;
 
-       if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) {
-               td->ddir_nr = td->o.ddir_nr;
+       assert(ddir_rw(ddir));
 
-               if (get_next_rand_offset(td, f, ddir, &b))
-                       return 1;
-       } else {
-               if (f->last_pos >= f->real_file_size) {
-                       if (!td_random(td) ||
-                            get_next_rand_offset(td, f, ddir, &b))
-                               return 1;
-               } else
-                       b = (f->last_pos - f->file_offset) / td->o.min_bs[ddir];
+       if (td->o.ddir_seq_nr && !--td->ddir_seq_nr) {
+               rw_seq_hit = 1;
+               td->ddir_seq_nr = td->o.ddir_seq_nr;
        }
 
-       io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
+       if (get_next_block(td, io_u, ddir, rw_seq_hit))
+               return 1;
+
+       if (io_u->offset >= f->io_size) {
+               dprint(FD_IO, "get_next_offset: offset %llu >= io_size %llu\n",
+                                       io_u->offset, f->io_size);
+               return 1;
+       }
+
+       io_u->offset += f->file_offset;
        if (io_u->offset >= f->real_file_size) {
                dprint(FD_IO, "get_next_offset: offset %llu >= size %llu\n",
                                        io_u->offset, f->real_file_size);
@@ -193,47 +345,100 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
+static int get_next_offset(struct thread_data *td, struct io_u *io_u)
+{
+       if (td->flags & TD_F_PROFILE_OPS) {
+               struct prof_io_ops *ops = &td->prof_io_ops;
+
+               if (ops->fill_io_u_off)
+                       return ops->fill_io_u_off(td, io_u);
+       }
+
+       return __get_next_offset(td, io_u);
+}
+
+static inline int io_u_fits(struct thread_data *td, struct io_u *io_u,
+                           unsigned int buflen)
+{
+       struct fio_file *f = io_u->file;
+
+       return io_u->offset + buflen <= f->io_size + get_start_offset(td);
+}
+
+static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
        const int ddir = io_u->ddir;
-       unsigned int buflen;
-       long r;
-
-       if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
-               buflen = td->o.min_bs[ddir];
-       else {
-               r = os_random_long(&td->bsrange_state);
-               if (!td->o.bssplit_nr)
-                       buflen = (unsigned int) (1 + (double) (td->o.max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
-               else {
+       unsigned int buflen = 0;
+       unsigned int minbs, maxbs;
+       unsigned long r, rand_max;
+
+       assert(ddir_rw(ddir));
+
+       minbs = td->o.min_bs[ddir];
+       maxbs = td->o.max_bs[ddir];
+
+       if (minbs == maxbs)
+               return minbs;
+
+       /*
+        * If we can't satisfy the min block size from here, then fail
+        */
+       if (!io_u_fits(td, io_u, minbs))
+               return 0;
+
+       if (td->o.use_os_rand)
+               rand_max = OS_RAND_MAX;
+       else
+               rand_max = FRAND_MAX;
+
+       do {
+               if (td->o.use_os_rand)
+                       r = os_random_long(&td->bsrange_state);
+               else
+                       r = __rand(&td->__bsrange_state);
+
+               if (!td->o.bssplit_nr[ddir]) {
+                       buflen = 1 + (unsigned int) ((double) maxbs *
+                                       (r / (rand_max + 1.0)));
+                       if (buflen < minbs)
+                               buflen = minbs;
+               } else {
                        long perc = 0;
                        unsigned int i;
 
-                       for (i = 0; i < td->o.bssplit_nr; i++) {
-                               struct bssplit *bsp = &td->o.bssplit[i];
+                       for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
+                               struct bssplit *bsp = &td->o.bssplit[ddir][i];
 
                                buflen = bsp->bs;
                                perc += bsp->perc;
-                               if (r <= ((LONG_MAX / 100L) * perc))
+                               if ((r <= ((rand_max / 100L) * perc)) &&
+                                   io_u_fits(td, io_u, buflen))
                                        break;
                        }
                }
-               if (!td->o.bs_unaligned)
-                       buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
-       }
 
-       if (io_u->offset + buflen > io_u->file->real_file_size) {
-               dprint(FD_IO, "lower buflen %u -> %u (ddir=%d)\n", buflen,
-                                               td->o.min_bs[ddir], ddir);
-               buflen = td->o.min_bs[ddir];
-       }
+               if (!td->o.bs_unaligned && is_power_of_2(minbs))
+                       buflen = (buflen + minbs - 1) & ~(minbs - 1);
+
+       } while (!io_u_fits(td, io_u, buflen));
 
        return buflen;
 }
 
+static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
+{
+       if (td->flags & TD_F_PROFILE_OPS) {
+               struct prof_io_ops *ops = &td->prof_io_ops;
+
+               if (ops->fill_io_u_size)
+                       return ops->fill_io_u_size(td, io_u);
+       }
+
+       return __get_next_buflen(td, io_u);
+}
+
 static void set_rwmix_bytes(struct thread_data *td)
 {
-       unsigned long long rbytes;
        unsigned int diff;
 
        /*
@@ -241,25 +446,95 @@ static void set_rwmix_bytes(struct thread_data *td)
         * buffered writes may issue a lot quicker than they complete,
         * whereas reads do not.
         */
-       rbytes = td->io_bytes[td->rwmix_ddir] - td->rwmix_bytes;
        diff = td->o.rwmix[td->rwmix_ddir ^ 1];
-
-       td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * ((100 - diff)) / diff);
+       td->rwmix_issues = (td->io_issues[td->rwmix_ddir] * diff) / 100;
 }
 
 static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
 {
        unsigned int v;
-       long r;
+       unsigned long r;
 
-       r = os_random_long(&td->rwmix_state);
-       v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0)));
-       if (v < td->o.rwmix[DDIR_READ])
+       if (td->o.use_os_rand) {
+               r = os_random_long(&td->rwmix_state);
+               v = 1 + (int) (100.0 * (r / (OS_RAND_MAX + 1.0)));
+       } else {
+               r = __rand(&td->__rwmix_state);
+               v = 1 + (int) (100.0 * (r / (FRAND_MAX + 1.0)));
+       }
+
+       if (v <= td->o.rwmix[DDIR_READ])
                return DDIR_READ;
 
        return DDIR_WRITE;
 }
 
+static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
+{
+       enum fio_ddir odir = ddir ^ 1;
+       struct timeval t;
+       long usec;
+
+       assert(ddir_rw(ddir));
+
+       if (td->rate_pending_usleep[ddir] <= 0)
+               return ddir;
+
+       /*
+        * We have too much pending sleep in this direction. See if we
+        * should switch.
+        */
+       if (td_rw(td)) {
+               /*
+                * Other direction does not have too much pending, switch
+                */
+               if (td->rate_pending_usleep[odir] < 100000)
+                       return odir;
+
+               /*
+                * Both directions have pending sleep. Sleep the minimum time
+                * and deduct from both.
+                */
+               if (td->rate_pending_usleep[ddir] <=
+                       td->rate_pending_usleep[odir]) {
+                       usec = td->rate_pending_usleep[ddir];
+               } else {
+                       usec = td->rate_pending_usleep[odir];
+                       ddir = odir;
+               }
+       } else
+               usec = td->rate_pending_usleep[ddir];
+
+       /*
+        * We are going to sleep, ensure that we flush anything pending as
+        * not to skew our latency numbers.
+        *
+        * Changed to only monitor 'in flight' requests here instead of the
+        * td->cur_depth, b/c td->cur_depth does not accurately represent
+        * io's that have been actually submitted to an async engine,
+        * and cur_depth is meaningless for sync engines.
+        */
+       if (td->io_u_in_flight) {
+               int fio_unused ret;
+
+               ret = io_u_queued_complete(td, td->io_u_in_flight, NULL);
+       }
+
+       fio_gettime(&t, NULL);
+       usec_sleep(td, usec);
+       usec = utime_since_now(&t);
+
+       td->rate_pending_usleep[ddir] -= usec;
+
+       odir = ddir ^ 1;
+       if (td_rw(td) && __should_check_rate(td, odir))
+               td->rate_pending_usleep[odir] -= usec;
+
+       if (ddir_trim(ddir))
+               return ddir;
+       return ddir;
+}
+
 /*
  * Return the data direction for the next io_u. If the job is a
  * mixed read/write workload, check the rwmix cycle and switch if
@@ -267,84 +542,122 @@ static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
  */
 static enum fio_ddir get_rw_ddir(struct thread_data *td)
 {
-       if (td_rw(td)) {
-               struct timeval now;
-               unsigned long elapsed;
-               unsigned int cycle;
+       enum fio_ddir ddir;
 
-               fio_gettime(&now, NULL);
-               elapsed = mtime_since_now(&td->rwmix_switch);
+       /*
+        * see if it's time to fsync
+        */
+       if (td->o.fsync_blocks &&
+          !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
+            td->io_issues[DDIR_WRITE] && should_fsync(td))
+               return DDIR_SYNC;
 
-               /*
-                * if this is the first cycle, make it shorter
-                */
-               cycle = td->o.rwmixcycle;
-               if (!td->rwmix_bytes)
-                       cycle /= 10;
+       /*
+        * see if it's time to fdatasync
+        */
+       if (td->o.fdatasync_blocks &&
+          !(td->io_issues[DDIR_WRITE] % td->o.fdatasync_blocks) &&
+            td->io_issues[DDIR_WRITE] && should_fsync(td))
+               return DDIR_DATASYNC;
+
+       /*
+        * see if it's time to sync_file_range
+        */
+       if (td->sync_file_range_nr &&
+          !(td->io_issues[DDIR_WRITE] % td->sync_file_range_nr) &&
+            td->io_issues[DDIR_WRITE] && should_fsync(td))
+               return DDIR_SYNC_FILE_RANGE;
 
+       if (td_rw(td)) {
                /*
                 * Check if it's time to seed a new data direction.
                 */
-               if (elapsed >= cycle ||
-                   td->io_bytes[td->rwmix_ddir] >= td->rwmix_bytes) {
-                       unsigned long long max_bytes;
-                       enum fio_ddir ddir;                     
-
+               if (td->io_issues[td->rwmix_ddir] >= td->rwmix_issues) {
                        /*
                         * Put a top limit on how many bytes we do for
                         * one data direction, to avoid overflowing the
                         * ranges too much
                         */
                        ddir = get_rand_ddir(td);
-                       max_bytes = td->this_io_bytes[ddir];
-                       if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) {
-                               if (!td->rw_end_set[ddir]) {
-                                       td->rw_end_set[ddir] = 1;
-                                       memcpy(&td->rw_end[ddir], &now, sizeof(now));
-                               }
-                               ddir ^= 1;
-                       }
 
                        if (ddir != td->rwmix_ddir)
                                set_rwmix_bytes(td);
 
                        td->rwmix_ddir = ddir;
-                       memcpy(&td->rwmix_switch, &now, sizeof(now));
                }
-               return td->rwmix_ddir;
+               ddir = td->rwmix_ddir;
        } else if (td_read(td))
-               return DDIR_READ;
+               ddir = DDIR_READ;
+       else if (td_write(td))
+               ddir = DDIR_WRITE;
        else
-               return DDIR_WRITE;
+               ddir = DDIR_TRIM;
+
+       td->rwmix_ddir = rate_ddir(td, ddir);
+       return td->rwmix_ddir;
+}
+
+static void set_rw_ddir(struct thread_data *td, struct io_u *io_u)
+{
+       io_u->ddir = get_rw_ddir(td);
+
+       if (io_u->ddir == DDIR_WRITE && (td->io_ops->flags & FIO_BARRIER) &&
+           td->o.barrier_blocks &&
+          !(td->io_issues[DDIR_WRITE] % td->o.barrier_blocks) &&
+            td->io_issues[DDIR_WRITE])
+               io_u->flags |= IO_U_F_BARRIER;
+}
+
+void put_file_log(struct thread_data *td, struct fio_file *f)
+{
+       int ret = put_file(td, f);
+
+       if (ret)
+               td_verror(td, ret, "file close");
 }
 
 void put_io_u(struct thread_data *td, struct io_u *io_u)
 {
-       assert((io_u->flags & IO_U_F_FREE) == 0);
+       td_io_u_lock(td);
+
+       if (io_u->file && !(io_u->flags & IO_U_F_FREE_DEF))
+               put_file_log(td, io_u->file);
+       io_u->file = NULL;
+       io_u->flags &= ~IO_U_F_FREE_DEF;
        io_u->flags |= IO_U_F_FREE;
 
-       if (io_u->file)
-               put_file(td, io_u->file);
+       if (io_u->flags & IO_U_F_IN_CUR_DEPTH)
+               td->cur_depth--;
+       flist_del_init(&io_u->list);
+       flist_add(&io_u->list, &td->io_u_freelist);
+       td_io_u_unlock(td);
+       td_io_u_free_notify(td);
+}
 
-       io_u->file = NULL;
-       list_del(&io_u->list);
-       list_add(&io_u->list, &td->io_u_freelist);
-       td->cur_depth--;
+void clear_io_u(struct thread_data *td, struct io_u *io_u)
+{
+       io_u->flags &= ~IO_U_F_FLIGHT;
+       put_io_u(td, io_u);
 }
 
 void requeue_io_u(struct thread_data *td, struct io_u **io_u)
 {
        struct io_u *__io_u = *io_u;
 
+       dprint(FD_IO, "requeue %p\n", __io_u);
+
+       td_io_u_lock(td);
+
        __io_u->flags |= IO_U_F_FREE;
-       if ((__io_u->flags & IO_U_F_FLIGHT) && (__io_u->ddir != DDIR_SYNC))
+       if ((__io_u->flags & IO_U_F_FLIGHT) && ddir_rw(__io_u->ddir))
                td->io_issues[__io_u->ddir]--;
-               
-       __io_u->flags &= ~IO_U_F_FLIGHT;
 
-       list_del(&__io_u->list);
-       list_add_tail(&__io_u->list, &td->io_u_requeues);
-       td->cur_depth--;
+       __io_u->flags &= ~IO_U_F_FLIGHT;
+       if (__io_u->flags & IO_U_F_IN_CUR_DEPTH)
+               td->cur_depth--;
+       flist_del(&__io_u->list);
+       flist_add_tail(&__io_u->list, &td->io_u_requeues);
+       td_io_u_unlock(td);
        *io_u = NULL;
 }
 
@@ -353,24 +666,21 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
        if (td->io_ops->flags & FIO_NOIO)
                goto out;
 
+       set_rw_ddir(td, io_u);
+
        /*
-        * see if it's time to sync
+        * fsync() or fdatasync() or trim etc, we are done
         */
-       if (td->o.fsync_blocks &&
-          !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
-            td->io_issues[DDIR_WRITE] && should_fsync(td)) {
-               io_u->ddir = DDIR_SYNC;
+       if (!ddir_rw(io_u->ddir))
                goto out;
-       }
-
-       io_u->ddir = get_rw_ddir(td);
 
        /*
         * See if it's time to switch to a new zone
         */
-       if (td->zone_bytes >= td->o.zone_size) {
+       if (td->zone_bytes >= td->o.zone_size && td->o.zone_skip) {
                td->zone_bytes = 0;
-               io_u->file->last_pos += td->o.zone_skip;
+               io_u->file->file_offset += td->o.zone_range + td->o.zone_skip;
+               io_u->file->last_pos = io_u->file->file_offset;
                td->io_skip_bytes += td->o.zone_skip;
        }
 
@@ -399,7 +709,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
        /*
         * mark entry before potentially trimming io_u
         */
-       if (td_random(td) && !td->o.norandommap)
+       if (td_random(td) && file_randommap(td, io_u->file))
                mark_random_map(td, io_u);
 
        /*
@@ -412,123 +722,160 @@ out:
        return 0;
 }
 
-void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
+static void __io_u_mark_map(unsigned int *map, unsigned int nr)
 {
-       int index = 0;
+       int idx = 0;
 
-       if (io_u->ddir == DDIR_SYNC)
-               return;
+       switch (nr) {
+       default:
+               idx = 6;
+               break;
+       case 33 ... 64:
+               idx = 5;
+               break;
+       case 17 ... 32:
+               idx = 4;
+               break;
+       case 9 ... 16:
+               idx = 3;
+               break;
+       case 5 ... 8:
+               idx = 2;
+               break;
+       case 1 ... 4:
+               idx = 1;
+       case 0:
+               break;
+       }
+
+       map[idx]++;
+}
+
+void io_u_mark_submit(struct thread_data *td, unsigned int nr)
+{
+       __io_u_mark_map(td->ts.io_u_submit, nr);
+       td->ts.total_submit++;
+}
+
+void io_u_mark_complete(struct thread_data *td, unsigned int nr)
+{
+       __io_u_mark_map(td->ts.io_u_complete, nr);
+       td->ts.total_complete++;
+}
+
+void io_u_mark_depth(struct thread_data *td, unsigned int nr)
+{
+       int idx = 0;
 
        switch (td->cur_depth) {
        default:
-               index = 6;
+               idx = 6;
                break;
        case 32 ... 63:
-               index = 5;
+               idx = 5;
                break;
        case 16 ... 31:
-               index = 4;
+               idx = 4;
                break;
        case 8 ... 15:
-               index = 3;
+               idx = 3;
                break;
        case 4 ... 7:
-               index = 2;
+               idx = 2;
                break;
        case 2 ... 3:
-               index = 1;
+               idx = 1;
        case 1:
                break;
        }
 
-       td->ts.io_u_map[index]++;
-       td->ts.total_io_u[io_u->ddir]++;
+       td->ts.io_u_map[idx] += nr;
 }
 
 static void io_u_mark_lat_usec(struct thread_data *td, unsigned long usec)
 {
-       int index = 0;
+       int idx = 0;
 
        assert(usec < 1000);
 
        switch (usec) {
        case 750 ... 999:
-               index = 9;
+               idx = 9;
                break;
        case 500 ... 749:
-               index = 8;
+               idx = 8;
                break;
        case 250 ... 499:
-               index = 7;
+               idx = 7;
                break;
        case 100 ... 249:
-               index = 6;
+               idx = 6;
                break;
        case 50 ... 99:
-               index = 5;
+               idx = 5;
                break;
        case 20 ... 49:
-               index = 4;
+               idx = 4;
                break;
        case 10 ... 19:
-               index = 3;
+               idx = 3;
                break;
        case 4 ... 9:
-               index = 2;
+               idx = 2;
                break;
        case 2 ... 3:
-               index = 1;
+               idx = 1;
        case 0 ... 1:
                break;
        }
 
-       assert(index < FIO_IO_U_LAT_U_NR);
-       td->ts.io_u_lat_u[index]++;
+       assert(idx < FIO_IO_U_LAT_U_NR);
+       td->ts.io_u_lat_u[idx]++;
 }
 
 static void io_u_mark_lat_msec(struct thread_data *td, unsigned long msec)
 {
-       int index = 0;
+       int idx = 0;
 
        switch (msec) {
        default:
-               index = 11;
+               idx = 11;
                break;
        case 1000 ... 1999:
-               index = 10;
+               idx = 10;
                break;
        case 750 ... 999:
-               index = 9;
+               idx = 9;
                break;
        case 500 ... 749:
-               index = 8;
+               idx = 8;
                break;
        case 250 ... 499:
-               index = 7;
+               idx = 7;
                break;
        case 100 ... 249:
-               index = 6;
+               idx = 6;
                break;
        case 50 ... 99:
-               index = 5;
+               idx = 5;
                break;
        case 20 ... 49:
-               index = 4;
+               idx = 4;
                break;
        case 10 ... 19:
-               index = 3;
+               idx = 3;
                break;
        case 4 ... 9:
-               index = 2;
+               idx = 2;
                break;
        case 2 ... 3:
-               index = 1;
+               idx = 1;
        case 0 ... 1:
                break;
        }
 
-       assert(index < FIO_IO_U_LAT_M_NR);
-       td->ts.io_u_lat_m[index]++;
+       assert(idx < FIO_IO_U_LAT_M_NR);
+       td->ts.io_u_lat_m[idx]++;
 }
 
 static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
@@ -542,24 +889,46 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
 /*
  * Get next file to service by choosing one at random
  */
-static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
-                                          int badf)
+static struct fio_file *get_next_file_rand(struct thread_data *td,
+                                          enum fio_file_flags goodf,
+                                          enum fio_file_flags badf)
 {
        struct fio_file *f;
        int fno;
 
        do {
-               long r = os_random_long(&td->next_file_state);
+               int opened = 0;
+               unsigned long r;
+
+               if (td->o.use_os_rand) {
+                       r = os_random_long(&td->next_file_state);
+                       fno = (unsigned int) ((double) td->o.nr_files
+                               * (r / (OS_RAND_MAX + 1.0)));
+               } else {
+                       r = __rand(&td->__next_file_state);
+                       fno = (unsigned int) ((double) td->o.nr_files
+                               * (r / (FRAND_MAX + 1.0)));
+               }
 
-               fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
-               f = &td->files[fno];
-               if (f->flags & FIO_FILE_DONE)
+               f = td->files[fno];
+               if (fio_file_done(f))
                        continue;
 
+               if (!fio_file_open(f)) {
+                       int err;
+
+                       err = td_io_open_file(td, f);
+                       if (err)
+                               continue;
+                       opened = 1;
+               }
+
                if ((!goodf || (f->flags & goodf)) && !(f->flags & badf)) {
                        dprint(FD_FILE, "get_next_file_rand: %p\n", f);
                        return f;
                }
+               if (opened)
+                       td_io_close_file(td, f);
        } while (1);
 }
 
@@ -573,20 +942,41 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
        struct fio_file *f;
 
        do {
-               f = &td->files[td->next_file];
+               int opened = 0;
+
+               f = td->files[td->next_file];
 
                td->next_file++;
                if (td->next_file >= td->o.nr_files)
                        td->next_file = 0;
 
-               if (f->flags & FIO_FILE_DONE) {
+               dprint(FD_FILE, "trying file %s %x\n", f->file_name, f->flags);
+               if (fio_file_done(f)) {
                        f = NULL;
                        continue;
                }
 
+               if (!fio_file_open(f)) {
+                       int err;
+
+                       err = td_io_open_file(td, f);
+                       if (err) {
+                               dprint(FD_FILE, "error %d on open of %s\n",
+                                       err, f->file_name);
+                               f = NULL;
+                               continue;
+                       }
+                       opened = 1;
+               }
+
+               dprint(FD_FILE, "goodf=%x, badf=%x, ff=%x\n", goodf, badf,
+                                                               f->flags);
                if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
                        break;
 
+               if (opened)
+                       td_io_close_file(td, f);
+
                f = NULL;
        } while (td->next_file != old_next_file);
 
@@ -594,46 +984,51 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
        return f;
 }
 
-static struct fio_file *get_next_file(struct thread_data *td)
+static struct fio_file *__get_next_file(struct thread_data *td)
 {
        struct fio_file *f;
 
        assert(td->o.nr_files <= td->files_index);
 
-       if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files) {
-               dprint(FD_FILE, "get_next_file: nr_open=%d, nr_done=%d, nr_files=%d\n", td->nr_open_files, td->nr_done_files, td->o.nr_files);
+       if (td->nr_done_files >= td->o.nr_files) {
+               dprint(FD_FILE, "get_next_file: nr_open=%d, nr_done=%d,"
+                               " nr_files=%d\n", td->nr_open_files,
+                                                 td->nr_done_files,
+                                                 td->o.nr_files);
                return NULL;
        }
 
        f = td->file_service_file;
-       if (f && (f->flags & FIO_FILE_OPEN) && td->file_service_left--)
-               goto out;
+       if (f && fio_file_open(f) && !fio_file_closing(f)) {
+               if (td->o.file_service_type == FIO_FSERVICE_SEQ)
+                       goto out;
+               if (td->file_service_left--)
+                       goto out;
+       }
 
-       if (td->o.file_service_type == FIO_FSERVICE_RR)
-               f = get_next_file_rr(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+       if (td->o.file_service_type == FIO_FSERVICE_RR ||
+           td->o.file_service_type == FIO_FSERVICE_SEQ)
+               f = get_next_file_rr(td, FIO_FILE_open, FIO_FILE_closing);
        else
-               f = get_next_file_rand(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+               f = get_next_file_rand(td, FIO_FILE_open, FIO_FILE_closing);
 
        td->file_service_file = f;
        td->file_service_left = td->file_service_nr - 1;
 out:
-       dprint(FD_FILE, "get_next_file: %p\n", f);
+       dprint(FD_FILE, "get_next_file: %p [%s]\n", f, f->file_name);
        return f;
 }
 
-static struct fio_file *find_next_new_file(struct thread_data *td)
+static struct fio_file *get_next_file(struct thread_data *td)
 {
-       struct fio_file *f;
-
-       if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files)
-               return NULL;
+       if (!(td->flags & TD_F_PROFILE_OPS)) {
+               struct prof_io_ops *ops = &td->prof_io_ops;
 
-       if (td->o.file_service_type == FIO_FSERVICE_RR)
-               f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
-       else
-               f = get_next_file_rand(td, 0, FIO_FILE_OPEN);
+               if (ops->get_next_file)
+                       return ops->get_next_file(td);
+       }
 
-       return f;
+       return __get_next_file(td);
 }
 
 static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
@@ -645,35 +1040,19 @@ static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
                if (!f)
                        return 1;
 
-set_file:
                io_u->file = f;
                get_file(f);
 
                if (!fill_io_u(td, io_u))
                        break;
 
-               /*
-                * td_io_close() does a put_file() as well, so no need to
-                * do that here.
-                */
-               io_u->file = NULL;
+               put_file_log(td, f);
                td_io_close_file(td, f);
-               f->flags |= FIO_FILE_DONE;
+               io_u->file = NULL;
+               fio_file_set_done(f);
                td->nr_done_files++;
-
-               /*
-                * probably not the right place to do this, but see
-                * if we need to open a new file
-                */
-               if (td->nr_open_files < td->o.open_files &&
-                   td->o.open_files != td->o.nr_files) {
-                       f = find_next_new_file(td);
-
-                       if (!f || td_io_open_file(td, f))
-                               return 1;
-
-                       goto set_file;
-               }
+               dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name,
+                                       td->nr_done_files, td->o.nr_files);
        } while (1);
 
        return 0;
@@ -684,10 +1063,13 @@ struct io_u *__get_io_u(struct thread_data *td)
 {
        struct io_u *io_u = NULL;
 
-       if (!list_empty(&td->io_u_requeues))
-               io_u = list_entry(td->io_u_requeues.next, struct io_u, list);
+       td_io_u_lock(td);
+
+again:
+       if (!flist_empty(&td->io_u_requeues))
+               io_u = flist_entry(td->io_u_requeues.next, struct io_u, list);
        else if (!queue_full(td)) {
-               io_u = list_entry(td->io_u_freelist.next, struct io_u, list);
+               io_u = flist_entry(td->io_u_freelist.next, struct io_u, list);
 
                io_u->buflen = 0;
                io_u->resid = 0;
@@ -697,17 +1079,120 @@ struct io_u *__get_io_u(struct thread_data *td)
 
        if (io_u) {
                assert(io_u->flags & IO_U_F_FREE);
-               io_u->flags &= ~IO_U_F_FREE;
+               io_u->flags &= ~(IO_U_F_FREE | IO_U_F_FREE_DEF);
+               io_u->flags &= ~(IO_U_F_TRIMMED | IO_U_F_BARRIER);
+               io_u->flags &= ~IO_U_F_VER_LIST;
 
                io_u->error = 0;
-               list_del(&io_u->list);
-               list_add(&io_u->list, &td->io_u_busylist);
+               flist_del(&io_u->list);
+               flist_add_tail(&io_u->list, &td->io_u_busylist);
                td->cur_depth++;
+               io_u->flags |= IO_U_F_IN_CUR_DEPTH;
+       } else if (td->o.verify_async) {
+               /*
+                * We ran out, wait for async verify threads to finish and
+                * return one
+                */
+               pthread_cond_wait(&td->free_cond, &td->io_u_lock);
+               goto again;
        }
 
+       td_io_u_unlock(td);
        return io_u;
 }
 
+static int check_get_trim(struct thread_data *td, struct io_u *io_u)
+{
+       if (!(td->flags & TD_F_TRIM_BACKLOG))
+               return 0;
+
+       if (td->trim_entries) {
+               int get_trim = 0;
+
+               if (td->trim_batch) {
+                       td->trim_batch--;
+                       get_trim = 1;
+               } else if (!(td->io_hist_len % td->o.trim_backlog) &&
+                        td->last_ddir != DDIR_READ) {
+                       td->trim_batch = td->o.trim_batch;
+                       if (!td->trim_batch)
+                               td->trim_batch = td->o.trim_backlog;
+                       get_trim = 1;
+               }
+
+               if (get_trim && !get_next_trim(td, io_u))
+                       return 1;
+       }
+
+       return 0;
+}
+
+static int check_get_verify(struct thread_data *td, struct io_u *io_u)
+{
+       if (!(td->flags & TD_F_VER_BACKLOG))
+               return 0;
+
+       if (td->io_hist_len) {
+               int get_verify = 0;
+
+               if (td->verify_batch)
+                       get_verify = 1;
+               else if (!(td->io_hist_len % td->o.verify_backlog) &&
+                        td->last_ddir != DDIR_READ) {
+                       td->verify_batch = td->o.verify_batch;
+                       if (!td->verify_batch)
+                               td->verify_batch = td->o.verify_backlog;
+                       get_verify = 1;
+               }
+
+               if (get_verify && !get_next_verify(td, io_u)) {
+                       td->verify_batch--;
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+/*
+ * Fill offset and start time into the buffer content, to prevent too
+ * easy compressible data for simple de-dupe attempts. Do this for every
+ * 512b block in the range, since that should be the smallest block size
+ * we can expect from a device.
+ */
+static void small_content_scramble(struct io_u *io_u)
+{
+       unsigned int i, nr_blocks = io_u->buflen / 512;
+       uint64_t boffset;
+       unsigned int offset;
+       void *p, *end;
+
+       if (!nr_blocks)
+               return;
+
+       p = io_u->xfer_buf;
+       boffset = io_u->offset;
+       io_u->buf_filled_len = 0;
+
+       for (i = 0; i < nr_blocks; i++) {
+               /*
+                * Fill the byte offset into a "random" start offset of
+                * the buffer, given by the product of the usec time
+                * and the actual offset.
+                */
+               offset = (io_u->start_time.tv_usec ^ boffset) & 511;
+               offset &= ~(sizeof(uint64_t) - 1);
+               if (offset >= 512 - sizeof(uint64_t))
+                       offset -= sizeof(uint64_t);
+               memcpy(p + offset, &boffset, sizeof(boffset));
+
+               end = p + 512 - sizeof(io_u->start_time);
+               memcpy(end, &io_u->start_time, sizeof(io_u->start_time));
+               p += 512;
+               boffset += 512;
+       }
+}
+
 /*
  * Return an io_u to be processed. Gets a buflen and offset, sets direction,
  * etc. The returned io_u is fully ready to be prepped and submitted.
@@ -716,6 +1201,7 @@ struct io_u *get_io_u(struct thread_data *td)
 {
        struct fio_file *f;
        struct io_u *io_u;
+       int do_scramble = 0;
 
        io_u = __get_io_u(td);
        if (!io_u) {
@@ -723,6 +1209,11 @@ struct io_u *get_io_u(struct thread_data *td)
                return NULL;
        }
 
+       if (check_get_verify(td, io_u))
+               goto out;
+       if (check_get_trim(td, io_u))
+               goto out;
+
        /*
         * from a requeue, io_u already setup
         */
@@ -732,39 +1223,58 @@ struct io_u *get_io_u(struct thread_data *td)
        /*
         * If using an iolog, grab next piece if any available.
         */
-       if (td->o.read_iolog_file) {
+       if (td->flags & TD_F_READ_IOLOG) {
                if (read_iolog_get(td, io_u))
                        goto err_put;
        } else if (set_io_u_file(td, io_u)) {
                dprint(FD_IO, "io_u %p, setting file failed\n", io_u);
                goto err_put;
        }
-       
+
        f = io_u->file;
-       assert(f->flags & FIO_FILE_OPEN);
+       assert(fio_file_open(f));
 
-       if (io_u->ddir != DDIR_SYNC) {
+       if (ddir_rw(io_u->ddir)) {
                if (!io_u->buflen && !(td->io_ops->flags & FIO_NOIO)) {
                        dprint(FD_IO, "get_io_u: zero buflen on %p\n", io_u);
                        goto err_put;
                }
 
+               f->last_start = io_u->offset;
                f->last_pos = io_u->offset + io_u->buflen;
 
-               if (td->o.verify != VERIFY_NONE)
-                       populate_verify_io_u(td, io_u);
+               if (io_u->ddir == DDIR_WRITE) {
+                       if (td->flags & TD_F_REFILL_BUFFERS) {
+                               io_u_fill_buffer(td, io_u,
+                                       io_u->xfer_buflen, io_u->xfer_buflen);
+                       } else if (td->flags & TD_F_SCRAMBLE_BUFFERS)
+                               do_scramble = 1;
+                       if (td->flags & TD_F_VER_NONE) {
+                               populate_verify_io_u(td, io_u);
+                               do_scramble = 0;
+                       }
+               } else if (io_u->ddir == DDIR_READ) {
+                       /*
+                        * Reset the buf_filled parameters so next time if the
+                        * buffer is used for writes it is refilled.
+                        */
+                       io_u->buf_filled_len = 0;
+               }
        }
 
        /*
         * Set io data pointers.
         */
-       io_u->endpos = io_u->offset + io_u->buflen;
-out:
        io_u->xfer_buf = io_u->buf;
        io_u->xfer_buflen = io_u->buflen;
 
+out:
+       assert(io_u->file);
        if (!td_io_prep(td, io_u)) {
-               fio_gettime(&io_u->start_time, NULL);
+               if (!td->o.disable_slat)
+                       fio_gettime(&io_u->start_time, NULL);
+               if (do_scramble)
+                       small_content_scramble(io_u);
                return io_u;
        }
 err_put:
@@ -775,7 +1285,12 @@ err_put:
 
 void io_u_log_error(struct thread_data *td, struct io_u *io_u)
 {
-       const char *msg[] = { "read", "write", "sync" };
+       enum error_type_bit eb = td_error_type(io_u->ddir, io_u->error);
+       const char *msg[] = { "read", "write", "sync", "datasync",
+                               "sync_file_range", "wait", "trim" };
+
+       if (td_non_fatal_error(td, eb, io_u->error) && !td->o.error_dump)
+               return;
 
        log_err("fio: io_u error");
 
@@ -784,45 +1299,122 @@ void io_u_log_error(struct thread_data *td, struct io_u *io_u)
 
        log_err(": %s\n", strerror(io_u->error));
 
-       log_err("     %s offset=%llu, buflen=%lu\n", msg[io_u->ddir], io_u->offset, io_u->xfer_buflen);
+       log_err("     %s offset=%llu, buflen=%lu\n", msg[io_u->ddir],
+                                       io_u->offset, io_u->xfer_buflen);
 
        if (!td->error)
                td_verror(td, io_u->error, "io_u error");
 }
 
+static void account_io_completion(struct thread_data *td, struct io_u *io_u,
+                                 struct io_completion_data *icd,
+                                 const enum fio_ddir idx, unsigned int bytes)
+{
+       unsigned long lusec = 0;
+
+       if (!td->o.disable_clat || !td->o.disable_bw)
+               lusec = utime_since(&io_u->issue_time, &icd->time);
+
+       if (!td->o.disable_lat) {
+               unsigned long tusec;
+
+               tusec = utime_since(&io_u->start_time, &icd->time);
+               add_lat_sample(td, idx, tusec, bytes);
+
+               if (td->o.max_latency && tusec > td->o.max_latency) {
+                       if (!td->error)
+                               log_err("fio: latency of %lu usec exceeds specified max (%u usec)\n", tusec, td->o.max_latency);
+                       td_verror(td, ETIMEDOUT, "max latency exceeded");
+                       icd->error = ETIMEDOUT;
+               }
+       }
+
+       if (!td->o.disable_clat) {
+               add_clat_sample(td, idx, lusec, bytes);
+               io_u_mark_latency(td, lusec);
+       }
+
+       if (!td->o.disable_bw)
+               add_bw_sample(td, idx, bytes, &icd->time);
+
+       add_iops_sample(td, idx, &icd->time);
+}
+
+static long long usec_for_io(struct thread_data *td, enum fio_ddir ddir)
+{
+       uint64_t secs, remainder, bps, bytes;
+
+       bytes = td->this_io_bytes[ddir];
+       bps = td->rate_bps[ddir];
+       secs = bytes / bps;
+       remainder = bytes % bps;
+       return remainder * 1000000 / bps + secs * 1000000;
+}
+
 static void io_completed(struct thread_data *td, struct io_u *io_u,
                         struct io_completion_data *icd)
 {
-       unsigned long usec;
+       struct fio_file *f;
 
        dprint_io_u(io_u, "io complete");
 
+       td_io_u_lock(td);
        assert(io_u->flags & IO_U_F_FLIGHT);
-       io_u->flags &= ~IO_U_F_FLIGHT;
+       io_u->flags &= ~(IO_U_F_FLIGHT | IO_U_F_BUSY_OK);
+       td_io_u_unlock(td);
 
-       if (io_u->ddir == DDIR_SYNC) {
+       if (ddir_sync(io_u->ddir)) {
                td->last_was_sync = 1;
+               f = io_u->file;
+               if (f) {
+                       f->first_write = -1ULL;
+                       f->last_write = -1ULL;
+               }
                return;
        }
 
        td->last_was_sync = 0;
+       td->last_ddir = io_u->ddir;
 
-       if (!io_u->error) {
+       if (!io_u->error && ddir_rw(io_u->ddir)) {
                unsigned int bytes = io_u->buflen - io_u->resid;
                const enum fio_ddir idx = io_u->ddir;
+               const enum fio_ddir odx = io_u->ddir ^ 1;
                int ret;
 
                td->io_blocks[idx]++;
+               td->this_io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
-               td->this_io_bytes[idx] += bytes;
 
-               io_u->file->last_completed_pos = io_u->endpos;
+               if (!(io_u->flags & IO_U_F_VER_LIST))
+                       td->this_io_bytes[idx] += bytes;
+
+               if (idx == DDIR_WRITE) {
+                       f = io_u->file;
+                       if (f) {
+                               if (f->first_write == -1ULL ||
+                                   io_u->offset < f->first_write)
+                                       f->first_write = io_u->offset;
+                               if (f->last_write == -1ULL ||
+                                   ((io_u->offset + bytes) > f->last_write))
+                                       f->last_write = io_u->offset + bytes;
+                       }
+               }
 
-               usec = utime_since(&io_u->issue_time, &icd->time);
+               if (ramp_time_over(td) && (td->runstate == TD_RUNNING ||
+                                          td->runstate == TD_VERIFYING)) {
+                       account_io_completion(td, io_u, icd, idx, bytes);
 
-               add_clat_sample(td, idx, usec);
-               add_bw_sample(td, idx, &icd->time);
-               io_u_mark_latency(td, usec);
+                       if (__should_check_rate(td, idx)) {
+                               td->rate_pending_usleep[idx] =
+                                       (usec_for_io(td, idx) -
+                                        utime_since_now(&td->start));
+                       }
+                       if (idx != DDIR_TRIM && __should_check_rate(td, odx))
+                               td->rate_pending_usleep[odx] =
+                                       (usec_for_io(td, odx) -
+                                        utime_since_now(&td->start));
+               }
 
                if (td_write(td) && idx == DDIR_WRITE &&
                    td->o.do_verify &&
@@ -836,20 +1428,37 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                        if (ret && !icd->error)
                                icd->error = ret;
                }
-       } else {
+       } else if (io_u->error) {
                icd->error = io_u->error;
                io_u_log_error(td, io_u);
        }
+       if (icd->error) {
+               enum error_type_bit eb = td_error_type(io_u->ddir, icd->error);
+               if (!td_non_fatal_error(td, eb, icd->error))
+                       return;
+               /*
+                * If there is a non_fatal error, then add to the error count
+                * and clear all the errors.
+                */
+               update_error_count(td, icd->error);
+               td_clear_error(td);
+               icd->error = 0;
+               io_u->error = 0;
+       }
 }
 
-static void init_icd(struct io_completion_data *icd, int nr)
+static void init_icd(struct thread_data *td, struct io_completion_data *icd,
+                    int nr)
 {
-       fio_gettime(&icd->time, NULL);
+       int ddir;
+       if (!td->o.disable_clat || !td->o.disable_bw)
+               fio_gettime(&icd->time, NULL);
 
        icd->nr = nr;
 
        icd->error = 0;
-       icd->bytes_done[0] = icd->bytes_done[1] = 0;
+       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+               icd->bytes_done[ddir] = 0;
 }
 
 static void ios_completed(struct thread_data *td,
@@ -862,57 +1471,79 @@ static void ios_completed(struct thread_data *td,
                io_u = td->io_ops->event(td, i);
 
                io_completed(td, io_u, icd);
-               put_io_u(td, io_u);
+
+               if (!(io_u->flags & IO_U_F_FREE_DEF))
+                       put_io_u(td, io_u);
        }
 }
 
 /*
  * Complete a single io_u for the sync engines.
  */
-long io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
+int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
+                      unsigned long *bytes)
 {
        struct io_completion_data icd;
 
-       init_icd(&icd, 1);
+       init_icd(td, &icd, 1);
        io_completed(td, io_u, &icd);
-       put_io_u(td, io_u);
 
-       if (!icd.error)
-               return icd.bytes_done[0] + icd.bytes_done[1];
+       if (!(io_u->flags & IO_U_F_FREE_DEF))
+               put_io_u(td, io_u);
 
-       td_verror(td, icd.error, "io_u_sync_complete");
-       return -1;
+       if (icd.error) {
+               td_verror(td, icd.error, "io_u_sync_complete");
+               return -1;
+       }
+
+       if (bytes) {
+               int ddir;
+
+               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+                       bytes[ddir] += icd.bytes_done[ddir];
+       }
+
+       return 0;
 }
 
 /*
  * Called to complete min_events number of io for the async engines.
  */
-long io_u_queued_complete(struct thread_data *td, int min_events)
+int io_u_queued_complete(struct thread_data *td, int min_evts,
+                        unsigned long *bytes)
 {
        struct io_completion_data icd;
        struct timespec *tvp = NULL;
        int ret;
        struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
 
-       dprint(FD_IO, "io_u_queued_completed: min=%d\n", min_events);
+       dprint(FD_IO, "io_u_queued_completed: min=%d\n", min_evts);
 
-       if (!min_events)
+       if (!min_evts)
                tvp = &ts;
 
-       ret = td_io_getevents(td, min_events, td->cur_depth, tvp);
+       ret = td_io_getevents(td, min_evts, td->o.iodepth_batch_complete, tvp);
        if (ret < 0) {
                td_verror(td, -ret, "td_io_getevents");
                return ret;
        } else if (!ret)
                return ret;
 
-       init_icd(&icd, ret);
+       init_icd(td, &icd, ret);
        ios_completed(td, &icd);
-       if (!icd.error)
-               return icd.bytes_done[0] + icd.bytes_done[1];
+       if (icd.error) {
+               td_verror(td, icd.error, "io_u_queued_complete");
+               return -1;
+       }
 
-       td_verror(td, icd.error, "io_u_queued_complete");
-       return -1;
+       if (bytes) {
+               int ddir;
+
+               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+                       bytes[ddir] += icd.bytes_done[ddir];
+       }
+
+       return 0;
 }
 
 /*
@@ -920,88 +1551,33 @@ long io_u_queued_complete(struct thread_data *td, int min_events)
  */
 void io_u_queued(struct thread_data *td, struct io_u *io_u)
 {
-       unsigned long slat_time;
-
-       slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
-       add_slat_sample(td, io_u->ddir, slat_time);
-}
-
-#ifdef FIO_USE_TIMEOUT
-void io_u_set_timeout(struct thread_data *td)
-{
-       assert(td->cur_depth);
-
-       td->timer.it_interval.tv_sec = 0;
-       td->timer.it_interval.tv_usec = 0;
-       td->timer.it_value.tv_sec = IO_U_TIMEOUT + IO_U_TIMEOUT_INC;
-       td->timer.it_value.tv_usec = 0;
-       setitimer(ITIMER_REAL, &td->timer, NULL);
-       fio_gettime(&td->timeout_end, NULL);
-}
-
-static void io_u_dump(struct io_u *io_u)
-{
-       unsigned long t_start = mtime_since_now(&io_u->start_time);
-       unsigned long t_issue = mtime_since_now(&io_u->issue_time);
+       if (!td->o.disable_slat) {
+               unsigned long slat_time;
 
-       log_err("io_u=%p, t_start=%lu, t_issue=%lu\n", io_u, t_start, t_issue);
-       log_err("  buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf, io_u->xfer_buf, io_u->buflen, io_u->xfer_buflen, io_u->offset);
-       log_err("  ddir=%d, fname=%s\n", io_u->ddir, io_u->file->file_name);
-}
-#else
-void io_u_set_timeout(struct thread_data fio_unused *td)
-{
+               slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
+               add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen);
+       }
 }
-#endif
 
-#ifdef FIO_USE_TIMEOUT
-static void io_u_timeout_handler(int fio_unused sig)
+/*
+ * "randomly" fill the buffer contents
+ */
+void io_u_fill_buffer(struct thread_data *td, struct io_u *io_u,
+                     unsigned int min_write, unsigned int max_bs)
 {
-       struct thread_data *td, *__td;
-       pid_t pid = getpid();
-       struct list_head *entry;
-       struct io_u *io_u;
-       int i;
+       io_u->buf_filled_len = 0;
 
-       log_err("fio: io_u timeout\n");
+       if (!td->o.zero_buffers) {
+               unsigned int perc = td->o.compress_percentage;
 
-       /*
-        * TLS would be nice...
-        */
-       td = NULL;
-       for_each_td(__td, i) {
-               if (__td->pid == pid) {
-                       td = __td;
-                       break;
-               }
-       }
+               if (perc) {
+                       unsigned int seg = min_write;
 
-       if (!td) {
-               log_err("fio: io_u timeout, can't find job\n");
-               exit(1);
-       }
-
-       if (!td->cur_depth) {
-               log_err("fio: timeout without pending work?\n");
-               return;
-       }
-
-       log_err("fio: io_u timeout: job=%s, pid=%d\n", td->o.name, td->pid);
-
-       list_for_each(entry, &td->io_u_busylist) {
-               io_u = list_entry(entry, struct io_u, list);
-
-               io_u_dump(io_u);
-       }
-
-       td_verror(td, ETIMEDOUT, "io_u timeout");
-       exit(1);
-}
-#endif
-
-void io_u_init_timeout(void)
-{
-#ifdef FIO_USE_TIMEOUT
-       signal(SIGALRM, io_u_timeout_handler);
-#endif
+                       seg = min(min_write, td->o.compress_chunk);
+                       fill_random_buf_percentage(&td->buf_state, io_u->buf,
+                                               perc, seg, max_bs);
+               } else
+                       fill_random_buf(&td->buf_state, io_u->buf, max_bs);
+       } else
+               memset(io_u->buf, 0, max_bs);
 }