* If we have a mixed random workload, we may
* encounter blocks we already did IO to.
*/
- if (!td->o.ddir_nr && !random_map_free(td, f, block))
+ if (!td->o.ddir_nr == 1 && !random_map_free(td, f, block))
break;
idx = RAND_MAP_IDX(td, f, block);
/*
* calculate map offset and chec if it's free
*/
- rb = *b + (f->file_offset / td->o.min_bs[ddir]);
+ rb = *b;
if (random_map_free(td, f, rb))
return 0;
if (get_next_rand_offset(td, f, ddir, &b))
return 1;
} else {
- if (f->last_pos >= f->real_file_size)
- return 1;
-
- b = f->last_pos / td->o.min_bs[ddir];
+ if (f->last_pos >= f->real_file_size) {
+ if (!td_random(td) || get_next_rand_offset(td, f, ddir, &b))
+ return 1;
+ } else
+ b = (f->last_pos - f->file_offset) / td->o.min_bs[ddir];
}
io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
buflen = td->o.min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
- buflen = (unsigned int) (1 + (double) (td->o.max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+ if (!td->o.bssplit_nr)
+ buflen = (unsigned int) (1 + (double) (td->o.max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+ else {
+ long perc = 0;
+ unsigned int i;
+
+ for (i = 0; i < td->o.bssplit_nr; i++) {
+ struct bssplit *bsp = &td->o.bssplit[i];
+
+ buflen = bsp->bs;
+ perc += bsp->perc;
+ if (r <= ((LONG_MAX / 100L) * perc))
+ break;
+ }
+ }
if (!td->o.bs_unaligned)
buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
}
+ if (io_u->offset + buflen > io_u->file->real_file_size)
+ buflen = td->o.min_bs[ddir];
+
return buflen;
}
static int fill_io_u(struct thread_data *td, struct io_u *io_u)
{
- /*
- * If using an iolog, grab next piece if any available.
- */
- if (td->o.read_iolog_file)
- return read_iolog_get(td, io_u);
+ if (td->io_ops->flags & FIO_NOIO)
+ goto out;
/*
* see if it's time to sync
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.
if (!io_u->buflen)
return 1;
+ if (io_u->offset + io_u->buflen > io_u->file->real_file_size)
+ return 1;
+
/*
* mark entry before potentially trimming io_u
*/
* If using a write iolog, store this entry.
*/
out:
- if (td->o.write_iolog_file)
- write_iolog_put(td, io_u);
-
+ log_io_u(td, io_u);
return 0;
}
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);
}
/*
return f;
}
+static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
+{
+ struct fio_file *f;
+
+ do {
+ f = get_next_file(td);
+ if (!f)
+ return 1;
+
+set_file:
+ io_u->file = f;
+ get_file(f);
+
+ if (!fill_io_u(td, io_u))
+ break;
+
+ /*
+ * 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);
+ f->flags |= FIO_FILE_DONE;
+ td->nr_done_files++;
+
+ /*
+ * probably not the right place to do this, but see
+ * if we need to open a new file
+ */
+ if (td->nr_open_files < td->o.open_files &&
+ td->o.open_files != td->o.nr_files) {
+ f = find_next_new_file(td);
+
+ if (!f || td_io_open_file(td, f))
+ return 1;
+
+ goto set_file;
+ }
+ } while (1);
+
+ return 0;
+}
+
+
struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u = NULL;
{
struct fio_file *f;
struct io_u *io_u;
- int ret;
io_u = __get_io_u(td);
if (!io_u)
if (io_u->file)
goto out;
- do {
- f = get_next_file(td);
- if (!f) {
- put_io_u(td, io_u);
- return NULL;
- }
-
-set_file:
- io_u->file = f;
- get_file(f);
-
- if (!fill_io_u(td, io_u))
- break;
-
- /*
- * 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);
- f->flags |= FIO_FILE_DONE;
- td->nr_done_files++;
-
- /*
- * probably not the right place to do this, but see
- * if we need to open a new file
- */
- if (td->nr_open_files < td->o.open_files &&
- td->o.open_files != td->o.nr_files) {
- f = find_next_new_file(td);
-
- if (!f || (ret = td_io_open_file(td, f))) {
- put_io_u(td, io_u);
- return NULL;
- }
- goto set_file;
- }
- } while (1);
-
- if (td->zone_bytes >= td->o.zone_size) {
- td->zone_bytes = 0;
- f->last_pos += td->o.zone_skip;
- }
+ /*
+ * If using an iolog, grab next piece if any available.
+ */
+ if (td->o.read_iolog_file) {
+ if (read_iolog_get(td, io_u))
+ goto err_put;
+ } else if (set_io_u_file(td, io_u))
+ goto err_put;
+
+ f = io_u->file;
+ assert(f->flags & FIO_FILE_OPEN);
if (io_u->ddir != DDIR_SYNC) {
- if (!io_u->buflen) {
- put_io_u(td, io_u);
- return NULL;
- }
+ if (!io_u->buflen)
+ goto err_put;
f->last_pos = io_u->offset + io_u->buflen;
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
- if (td_io_prep(td, io_u)) {
- put_io_u(td, io_u);
- return NULL;
+ if (!td_io_prep(td, io_u)) {
+ fio_gettime(&io_u->start_time, NULL);
+ return io_u;
}
-
- fio_gettime(&io_u->start_time, NULL);
- return io_u;
+err_put:
+ put_io_u(td, io_u);
+ return NULL;
}
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;
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.do_verify &&
td->o.verify != VERIFY_NONE)
log_io_piece(td, 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);
}
projects / fio.git / blobdiff