*b = (i * BLOCKS_PER_MAP);
while ((*b) * td->o.rw_min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
- *b += ffz(f->file_map[i]);
+ *b += fio_ffz(f->file_map[i]);
f->last_free_lookup = i;
return 0;
}
*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);
}
/*
assert((io_u->flags & IO_U_F_FREE) == 0);
io_u->flags |= IO_U_F_FREE;
+ if (io_u->file)
+ put_file(td, io_u->file);
+
io_u->file = NULL;
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_freelist);
/*
* If using an iolog, grab next piece if any available.
*/
- if (td->o.read_iolog)
+ if (td->o.read_iolog_file)
return read_iolog_get(td, io_u);
/*
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) {
+ td->zone_bytes = 0;
+ io_u->file->last_pos += td->o.zone_skip;
+ td->io_skip_bytes += td->o.zone_skip;
+ }
+
/*
* No log, let the seq/rand engine retrieve the next buflen and
* position.
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;
}
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);
}
/*
set_file:
io_u->file = f;
+ get_file(f);
if (!fill_io_u(td, io_u))
break;
/*
- * No more to do for this file, close it
+ * td_io_close() does a put_file() as well, so no need to
+ * do that here.
*/
io_u->file = NULL;
td_io_close_file(td, f);
}
} while (1);
- if (td->zone_bytes >= td->o.zone_size) {
- td->zone_bytes = 0;
- f->last_pos += td->o.zone_skip;
- }
+ assert(io_u->file->flags & FIO_FILE_OPEN);
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen) {
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;
- put_file(td, io_u->file);
-
if (io_u->ddir == DDIR_SYNC) {
td->last_was_sync = 1;
return;
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)
{
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);
}
projects / fio.git / blobdiff