[PATCH] file descriptor is int

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 89ece538c570391b8812957f2e4a428d1ab1bb65..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++;
@@ -138,13 +137,6 @@ static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
        }
 
        while (buflen + io_u->offset > f->real_file_size) {
-               /*
-                * 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)
-                       return 0;
-
                if (buflen == td->min_bs[ddir])
                        return 0;
 
@@ -271,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;
@@ -375,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);