git:// url location change

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index e892ec759c761de338f9e5789f74c13a3bbfb45c..e0614bd0a11946f132a6b0063e0015ff6e6ad48b 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -109,20 +109,40 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
                        *b = 0;
                else
                        *b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+               /*
+                * if we are not maintaining a random map, we are done.
+                */
                if (td->o.norandommap)
-                       break;
+                       return 0;
+
+               /*
+                * calculate map offset and chec if it's free
+                */
                rb = *b + (f->file_offset / td->o.min_bs[ddir]);
-               loops--;
-       } while (!random_map_free(td, f, rb) && loops);
+               if (random_map_free(td, f, rb))
+                       return 0;
+
+       } while (--loops);
 
        /*
-        * if we failed to retrieve a truly random offset within
-        * the loops assigned, see if there are free ones left at all
+        * 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 (!loops && get_next_free_block(td, f, b))
-               return 1;
+       loops = 10;
+       do {
+               f->last_free_lookup = (f->num_maps - 1) * (r / (RAND_MAX+1.0));
+               if (!get_next_free_block(td, f, b))
+                       return 0;
 
-       return 0;
+               r = os_random_long(&td->random_state);
+       } while (--loops);
+
+       /*
+        * that didn't work either, try exhaustive search from the start
+        */
+       f->last_free_lookup = 0;
+       return get_next_free_block(td, f, b);
 }
 
 /*
@@ -343,17 +363,22 @@ void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
 
        switch (td->cur_depth) {
        default:
-               index++;
+               index = 6;
+               break;
        case 32 ... 63:
-               index++;
+               index = 5;
+               break;
        case 16 ... 31:
-               index++;
+               index = 4;
+               break;
        case 8 ... 15:
-               index++;
+               index = 3;
+               break;
        case 4 ... 7:
-               index++;
+               index = 2;
+               break;
        case 2 ... 3:
-               index++;
+               index = 1;
        case 1:
                break;
        }
@@ -362,38 +387,98 @@ void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
        td->ts.total_io_u[io_u->ddir]++;
 }
 
-static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
+static void io_u_mark_lat_usec(struct thread_data *td, unsigned long usec)
+{
+       int index = 0;
+
+       assert(usec < 1000);
+
+       switch (usec) {
+       case 750 ... 999:
+               index = 9;
+               break;
+       case 500 ... 749:
+               index = 8;
+               break;
+       case 250 ... 499:
+               index = 7;
+               break;
+       case 100 ... 249:
+               index = 6;
+               break;
+       case 50 ... 99:
+               index = 5;
+               break;
+       case 20 ... 49:
+               index = 4;
+               break;
+       case 10 ... 19:
+               index = 3;
+               break;
+       case 4 ... 9:
+               index = 2;
+               break;
+       case 2 ... 3:
+               index = 1;
+       case 0 ... 1:
+               break;
+       }
+
+       assert(index < FIO_IO_U_LAT_U_NR);
+       td->ts.io_u_lat_u[index]++;
+}
+
+static void io_u_mark_lat_msec(struct thread_data *td, unsigned long msec)
 {
        int index = 0;
 
        switch (msec) {
        default:
-               index++;
+               index = 11;
+               break;
        case 1000 ... 1999:
-               index++;
+               index = 10;
+               break;
        case 750 ... 999:
-               index++;
+               index = 9;
+               break;
        case 500 ... 749:
-               index++;
+               index = 8;
+               break;
        case 250 ... 499:
-               index++;
+               index = 7;
+               break;
        case 100 ... 249:
-               index++;
+               index = 6;
+               break;
        case 50 ... 99:
-               index++;
+               index = 5;
+               break;
        case 20 ... 49:
-               index++;
+               index = 4;
+               break;
        case 10 ... 19:
-               index++;
+               index = 3;
+               break;
        case 4 ... 9:
-               index++;
+               index = 2;
+               break;
        case 2 ... 3:
-               index++;
+               index = 1;
        case 0 ... 1:
                break;
        }
 
-       td->ts.io_u_lat[index]++;
+       assert(index < FIO_IO_U_LAT_M_NR);
+       td->ts.io_u_lat_m[index]++;
+}
+
+static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
+{
+       if (usec < 1000)
+               io_u_mark_lat_usec(td, usec);
+       else
+               io_u_mark_lat_msec(td, usec / 1000);
 }
 
 /*
@@ -573,6 +658,8 @@ set_file:
                }
        } while (1);
 
+       assert(io_u->file->flags & FIO_FILE_OPEN);
+
        if (td->zone_bytes >= td->o.zone_size) {
                td->zone_bytes = 0;
                f->last_pos += td->o.zone_skip;
@@ -627,7 +714,7 @@ void io_u_log_error(struct thread_data *td, struct io_u *io_u)
 static void io_completed(struct thread_data *td, struct io_u *io_u,
                         struct io_completion_data *icd)
 {
-       unsigned long msec;
+       unsigned long usec;
 
        assert(io_u->flags & IO_U_F_FLIGHT);
        io_u->flags &= ~IO_U_F_FLIGHT;
@@ -651,11 +738,11 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 
                io_u->file->last_completed_pos = io_u->endpos;
 
-               msec = mtime_since(&io_u->issue_time, &icd->time);
+               usec = utime_since(&io_u->issue_time, &icd->time);
 
-               add_clat_sample(td, idx, msec);
+               add_clat_sample(td, idx, usec);
                add_bw_sample(td, idx, &icd->time);
-               io_u_mark_latency(td, msec);
+               io_u_mark_latency(td, usec);
 
                if (td_write(td) && idx == DDIR_WRITE &&
                    td->o.verify != VERIFY_NONE)
@@ -752,7 +839,7 @@ void io_u_queued(struct thread_data *td, struct io_u *io_u)
 {
        unsigned long slat_time;
 
-       slat_time = mtime_since(&io_u->start_time, &io_u->issue_time);
+       slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
        add_slat_sample(td, io_u->ddir, slat_time);
 }