Rename the bitmap to axmap
[fio.git] / io_u.c
diff --git a/io_u.c b/io_u.c
index a4f378d811dd87df2481db8756ee463306e44f9e..006f2c9efd622a30f70b38468183543c90b22558 100644 (file)
--- a/io_u.c
+++ b/io_u.c
 #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 fio_file *f, const unsigned long long block)
 {
-       unsigned int idx = RAND_MAP_IDX(f, block);
-       unsigned int bit = RAND_MAP_BIT(f, block);
-
-       dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit);
-
-       return (f->file_map[idx] & (1UL << bit)) == 0;
+       return !axmap_isset(f->io_axmap, block);
 }
 
 /*
@@ -41,61 +37,16 @@ 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, nr_blocks;
-       int busy_check;
+       unsigned int nr_blocks;
 
        block = (io_u->offset - f->file_offset) / (unsigned long long) min_bs;
        nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
-       blocks = 0;
-       busy_check = !(io_u->flags & IO_U_F_BUSY_OK);
-
-       while (nr_blocks) {
-               unsigned int idx, bit;
-               unsigned long mask, this_blocks;
-
-               /*
-                * If we have a mixed random workload, we may
-                * encounter blocks we already did IO to.
-                */
-               if (!busy_check) {
-                       blocks = nr_blocks;
-                       break;
-               }
-               if ((td->o.ddir_seq_nr == 1) && !random_map_free(f, block))
-                       break;
 
-               idx = RAND_MAP_IDX(f, block);
-               bit = RAND_MAP_BIT(f, block);
+       if (!(io_u->flags & IO_U_F_BUSY_OK))
+               nr_blocks = axmap_set_nr(f->io_axmap, block, nr_blocks);
 
-               fio_assert(td, idx < f->num_maps);
-
-               this_blocks = nr_blocks;
-               if (this_blocks + bit > BLOCKS_PER_MAP)
-                       this_blocks = BLOCKS_PER_MAP - bit;
-
-               do {
-                       if (this_blocks == BLOCKS_PER_MAP)
-                               mask = -1UL;
-                       else
-                               mask = ((1UL << this_blocks) - 1) << bit;
-       
-                       if (!(f->file_map[idx] & mask))
-                               break;
-
-                       this_blocks--;
-               } while (this_blocks);
-
-               if (!this_blocks)
-                       break;
-
-               f->file_map[idx] |= mask;
-               nr_blocks -= this_blocks;
-               blocks += this_blocks;
-               block += this_blocks;
-       }
-
-       if ((blocks * min_bs) < io_u->buflen)
-               io_u->buflen = blocks * min_bs;
+       if ((nr_blocks * min_bs) < io_u->buflen)
+               io_u->buflen = nr_blocks * min_bs;
 }
 
 static unsigned long long last_block(struct thread_data *td, struct fio_file *f,
@@ -123,117 +74,91 @@ static unsigned long long last_block(struct thread_data *td, struct fio_file *f,
        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)
+static int __get_next_rand_offset(struct thread_data *td, struct fio_file *f,
+                                 enum fio_ddir ddir, unsigned long long *b)
 {
-       unsigned long long block, min_bs = td->o.rw_min_bs, lastb;
-       int i;
+       unsigned long long r;
 
-       lastb = last_block(td, f, ddir);
-       if (!lastb)
-               return 1;
-
-       i = f->last_free_lookup;
-       block = i * BLOCKS_PER_MAP;
-       while (block * min_bs < f->real_file_size &&
-               block * min_bs < f->io_size) {
-               if (f->file_map[i] != -1UL) {
-                       block += ffz(f->file_map[i]);
-                       if (block > lastb)
-                               break;
-                       f->last_free_lookup = i;
-                       *b = block;
-                       return 0;
-               }
-
-               block += BLOCKS_PER_MAP;
-               i++;
-       }
+       if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE) {
+               unsigned long long rmax, lastb;
 
-       dprint(FD_IO, "failed finding a free block\n");
-       return 1;
-}
-
-static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
-                               enum fio_ddir ddir, unsigned long long *b)
-{
-       unsigned long long rmax, r, lastb;
-       int loops = 5;
-
-       lastb = last_block(td, f, ddir);
-       if (!lastb)
-               return 1;
+               lastb = last_block(td, f, ddir);
+               if (!lastb)
+                       return 1;
 
-       if (f->failed_rands >= 200)
-               goto ffz;
+               rmax = td->o.use_os_rand ? OS_RAND_MAX : FRAND_MAX;
 
-       rmax = td->o.use_os_rand ? OS_RAND_MAX : FRAND_MAX;
-       do {
-               if (td->o.use_os_rand)
+               if (td->o.use_os_rand) {
+                       rmax = OS_RAND_MAX;
                        r = os_random_long(&td->random_state);
-               else
+               } else {
+                       rmax = FRAND_MAX;
                        r = __rand(&td->__random_state);
-
-               *b = (lastb - 1) * (r / ((unsigned long long) rmax + 1.0));
+               }
 
                dprint(FD_RANDOM, "off rand %llu\n", r);
 
+               *b = (lastb - 1) * (r / ((unsigned long long) rmax + 1.0));
+       } else {
+               uint64_t off = 0;
 
-               /*
-                * if we are not maintaining a random map, we are done.
-                */
-               if (!file_randommap(td, f))
-                       goto ret_good;
-
-               /*
-                * calculate map offset and check if it's free
-                */
-               if (random_map_free(f, *b))
-                       goto ret_good;
-
-               dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n",
-                                                                       *b);
-       } while (--loops);
+               if (lfsr_next(&f->lfsr, &off))
+                       return 1;
 
-       if (!f->failed_rands++)
-               f->last_free_lookup = 0;
+               *b = off;
+       }
 
        /*
-        * 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 we are not maintaining a random map, we are done.
         */
-       loops = 10;
-       do {
-               f->last_free_lookup = (f->num_maps - 1) *
-                                       (r / ((unsigned long long) rmax + 1.0));
-               if (!get_next_free_block(td, f, ddir, b))
-                       goto ret;
-
-               if (td->o.use_os_rand)
-                       r = os_random_long(&td->random_state);
-               else
-                       r = __rand(&td->__random_state);
-       } while (--loops);
+       if (!file_randommap(td, f))
+               goto ret;
 
        /*
-        * that didn't work either, try exhaustive search from the start
+        * calculate map offset and check if it's free
         */
-       f->last_free_lookup = 0;
-ffz:
-       if (!get_next_free_block(td, f, ddir, b))
-               return 0;
-       f->last_free_lookup = 0;
-       return get_next_free_block(td, f, ddir, b);
-ret_good:
-       f->failed_rands = 0;
+       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_zipf(struct thread_data *td,
+                                      struct fio_file *f, enum fio_ddir ddir,
+                                      unsigned long long *b)
+{
+       *b = zipf_next(&f->zipf);
+       return 0;
+}
+
+static int __get_next_rand_offset_pareto(struct thread_data *td,
+                                        struct fio_file *f, enum fio_ddir ddir,
+                                        unsigned long long *b)
+{
+       *b = pareto_next(&f->zipf);
+       return 0;
+}
+
+static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
+                               enum fio_ddir ddir, unsigned long long *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_block(struct thread_data *td, struct fio_file *f,
                               enum fio_ddir ddir, unsigned long long *b)
 {
@@ -256,7 +181,7 @@ static int get_next_seq_offset(struct thread_data *td, struct fio_file *f,
 {
        assert(ddir_rw(ddir));
 
-       if (f->last_pos >= f->io_size && td->o.time_based)
+       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) {
@@ -317,7 +242,8 @@ static int get_next_block(struct thread_data *td, struct io_u *io_u,
                else if (b != -1ULL)
                        io_u->offset = b * td->o.ba[ddir];
                else {
-                       log_err("fio: bug in offset generation\n");
+                       log_err("fio: bug in offset generation: offset=%llu, b=%llu\n",
+                                                               offset, b);
                        ret = 1;
                }
        }
@@ -377,13 +303,13 @@ static inline int io_u_fits(struct thread_data *td, struct io_u *io_u,
 {
        struct fio_file *f = io_u->file;
 
-       return io_u->offset + buflen <= f->io_size + td->o.start_offset;
+       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 uninitialized_var(buflen);
+       unsigned int buflen = 0;
        unsigned int minbs, maxbs;
        unsigned long r, rand_max;
 
@@ -543,6 +469,8 @@ static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
        if (td_rw(td) && __should_check_rate(td, odir))
                td->rate_pending_usleep[odir] -= usec;
 
+       if (ddir_trim(ddir))
+               return ddir;
        return ddir;
 }
 
@@ -599,8 +527,10 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
                ddir = td->rwmix_ddir;
        } else if (td_read(td))
                ddir = DDIR_READ;
-       else
+       else if (td_write(td))
                ddir = DDIR_WRITE;
+       else
+               ddir = DDIR_TRIM;
 
        td->rwmix_ddir = rate_ddir(td, ddir);
        return td->rwmix_ddir;
@@ -1092,7 +1022,7 @@ again:
 
                io_u->error = 0;
                flist_del(&io_u->list);
-               flist_add(&io_u->list, &td->io_u_busylist);
+               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) {
@@ -1286,10 +1216,12 @@ err_put:
 
 void io_u_log_error(struct thread_data *td, struct io_u *io_u)
 {
+       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");
 
@@ -1309,7 +1241,7 @@ 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 uninitialized_var(lusec);
+       unsigned long lusec = 0;
 
        if (!td->o.disable_clat || !td->o.disable_bw)
                lusec = utime_since(&io_u->issue_time, &icd->time);
@@ -1319,6 +1251,13 @@ static void account_io_completion(struct thread_data *td, struct io_u *io_u,
 
                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) {
@@ -1345,11 +1284,6 @@ static long long usec_for_io(struct thread_data *td, enum fio_ddir ddir)
 static void io_completed(struct thread_data *td, struct io_u *io_u,
                         struct io_completion_data *icd)
 {
-       /*
-        * Older gcc's are too dumb to realize that usec is always used
-        * initialized, silence that warning.
-        */
-       unsigned long uninitialized_var(usec);
        struct fio_file *f;
 
        dprint_io_u(io_u, "io complete");
@@ -1381,7 +1315,9 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                td->io_blocks[idx]++;
                td->this_io_blocks[idx]++;
                td->io_bytes[idx] += bytes;
-               td->this_io_bytes[idx] += bytes;
+
+               if (!(io_u->flags & IO_U_F_VER_LIST))
+                       td->this_io_bytes[idx] += bytes;
 
                if (idx == DDIR_WRITE) {
                        f = io_u->file;
@@ -1404,7 +1340,7 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                                        (usec_for_io(td, idx) -
                                         utime_since_now(&td->start));
                        }
-                       if (__should_check_rate(td, odx))
+                       if (idx != DDIR_TRIM && __should_check_rate(td, odx))
                                td->rate_pending_usleep[odx] =
                                        (usec_for_io(td, odx) -
                                         utime_since_now(&td->start));
@@ -1426,8 +1362,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                icd->error = io_u->error;
                io_u_log_error(td, io_u);
        }
-       if (icd->error && td_non_fatal_error(icd->error) &&
-           (td->o.continue_on_error & td_error_type(io_u->ddir, icd->error))) {
+       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.
@@ -1442,13 +1380,15 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 static void init_icd(struct thread_data *td, struct io_completion_data *icd,
                     int nr)
 {
+       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,
@@ -1487,8 +1427,10 @@ int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
        }
 
        if (bytes) {
-               bytes[0] += icd.bytes_done[0];
-               bytes[1] += icd.bytes_done[1];
+               int ddir;
+
+               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+                       bytes[ddir] += icd.bytes_done[ddir];
        }
 
        return 0;
@@ -1525,8 +1467,10 @@ int io_u_queued_complete(struct thread_data *td, int min_evts,
        }
 
        if (bytes) {
-               bytes[0] += icd.bytes_done[0];
-               bytes[1] += icd.bytes_done[1];
+               int ddir;
+
+               for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+                       bytes[ddir] += icd.bytes_done[ddir];
        }
 
        return 0;