[PATCH] Add thinktime_spin parameter

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 34c7e6f44bce50fed649380d391977de9752b32c..132d8970b36d811cace110d7a927820e4b3a5542 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
-#include <assert.h>
 
 #include "fio.h"
 #include "os.h"
@@ -45,7 +44,7 @@ static void mark_random_map(struct thread_data *td, struct fio_file *f,
                idx = RAND_MAP_IDX(td, f, block);
                bit = RAND_MAP_BIT(td, f, block);
 
-               assert(idx < f->num_maps);
+               fio_assert(td, idx < f->num_maps);
 
                f->file_map[idx] |= (1UL << bit);
                block++;
@@ -105,24 +104,26 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
                        loops--;
                } while (!random_map_free(td, f, rb) && loops);
 
-               if (!loops) {
-                       if (get_next_free_block(td, f, &b))
-                               return 1;
-
-                       b += f->file_offset / td->min_bs[ddir];
-               }
+               /*
+                * if we failed to retrieve a truly random offset within
+                * the loops assigned, see if there are free ones left at all
+                */
+               if (!loops && get_next_free_block(td, f, &b))
+                       return 1;
        } else
                b = f->last_pos / td->min_bs[ddir];
 
        io_u->offset = (b * td->min_bs[ddir]) + f->file_offset;
-       if (io_u->offset > f->real_file_size)
+       if (io_u->offset >= f->real_file_size)
                return 1;
 
        return 0;
 }
 
-static unsigned int get_next_buflen(struct thread_data *td, int ddir)
+static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
+                                   struct io_u *io_u)
 {
+       const int ddir = io_u->ddir;
        unsigned int buflen;
        long r;
 
@@ -135,15 +136,11 @@ static unsigned int get_next_buflen(struct thread_data *td, int ddir)
                        buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
        }
 
-       if (buflen > td->io_size - td->this_io_bytes[ddir]) {
-               /*
-                * if using direct/raw io, we may not be able to
-                * shrink the size. so just fail it.
-                */
-               if (td->io_ops->flags & FIO_RAWIO)
+       while (buflen + io_u->offset > f->real_file_size) {
+               if (buflen == td->min_bs[ddir])
                        return 0;
 
-               buflen = td->io_size - td->this_io_bytes[ddir];
+               buflen = td->min_bs[ddir];
        }
 
        return buflen;
@@ -218,28 +215,27 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
         * No log, let the seq/rand engine retrieve the next buflen and
         * position.
         */
-       io_u->buflen = get_next_buflen(td, io_u->ddir);
-       if (io_u->buflen) {
-               if (!get_next_offset(td, f, io_u)) {
-                       /*
-                        * mark entry before potentially trimming io_u
-                        */
-                       if (!td->read_iolog && !td->sequential &&
-                           !td->norandommap)
-                               mark_random_map(td, f, io_u);
-
-                       /*
-                        * If using a write iolog, store this entry.
-                        */
-                       if (td->write_iolog_file)
-                               write_iolog_put(td, io_u);
-
-                       io_u->file = f;
-                       return 0;
-               }
-       }
+       if (get_next_offset(td, f, io_u))
+               return 1;
 
-       return 1;
+       io_u->buflen = get_next_buflen(td, f, io_u);
+       if (!io_u->buflen)
+               return 1;
+
+       /*
+        * mark entry before potentially trimming io_u
+        */
+       if (!td->read_iolog && !td->sequential && !td->norandommap)
+               mark_random_map(td, f, io_u);
+
+       /*
+        * If using a write iolog, store this entry.
+        */
+       if (td->write_iolog_file)
+               write_iolog_put(td, io_u);
+
+       io_u->file = f;
+       return 0;
 }
 
 static void io_u_mark_depth(struct thread_data *td)
@@ -267,6 +263,40 @@ static void io_u_mark_depth(struct thread_data *td)
        td->total_io_u++;
 }
 
+static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
+{
+       int index = 0;
+
+       switch (msec) {
+       default:
+               index++;
+       case 1024 ... 2047:
+               index++;
+       case 512 ... 1023:
+               index++;
+       case 256 ... 511:
+               index++;
+       case 128 ... 255:
+               index++;
+       case 64 ... 127:
+               index++;
+       case 32 ... 63:
+               index++;
+       case 16 ... 31:
+               index++;
+       case 8 ... 15:
+               index++;
+       case 4 ... 7:
+               index++;
+       case 2 ... 3:
+               index++;
+       case 0 ... 1:
+               break;
+       }
+
+       td->io_u_lat[index]++;
+}
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
        struct io_u *io_u = NULL;
@@ -371,6 +401,7 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
 
                add_clat_sample(td, idx, msec);
                add_bw_sample(td, idx, &icd->time);
+               io_u_mark_latency(td, msec);
 
                if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
                        log_io_piece(td, io_u);