*/
static void mark_random_map(struct thread_data *td, struct io_u *io_u)
{
- unsigned int min_bs = td->rw_min_bs;
+ unsigned int min_bs = td->o.rw_min_bs;
struct fio_file *f = io_u->file;
unsigned long long block;
unsigned int blocks;
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
- while ((*b) * td->rw_min_bs < f->real_file_size) {
+ while ((*b) * td->o.rw_min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
*b += ffz(f->file_map[i]);
f->last_free_lookup = i;
long r;
if (td_random(td)) {
- unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
+ unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir];
int loops = 5;
do {
r = os_random_long(&td->random_state);
- b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
- if (td->norandommap)
+ if (!max_blocks)
+ b = 0;
+ else
+ b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+ if (td->o.norandommap)
break;
- rb = b + (f->file_offset / td->min_bs[ddir]);
+ rb = b + (f->file_offset / td->o.min_bs[ddir]);
loops--;
} while (!random_map_free(td, f, rb) && loops);
if (!loops && get_next_free_block(td, f, &b))
return 1;
} else
- b = f->last_pos / td->min_bs[ddir];
+ b = f->last_pos / td->o.min_bs[ddir];
- io_u->offset = (b * td->min_bs[ddir]) + f->file_offset;
+ io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
if (io_u->offset >= f->real_file_size)
return 1;
unsigned int buflen;
long r;
- if (td->min_bs[ddir] == td->max_bs[ddir])
- buflen = td->min_bs[ddir];
+ if (td->o.min_bs[ddir] == td->o.max_bs[ddir])
+ buflen = td->o.min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
- buflen = (unsigned int) (1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
- if (!td->bs_unaligned)
- buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
+ buflen = (unsigned int) (1 + (double) (td->o.max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+ if (!td->o.bs_unaligned)
+ buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
}
while (buflen + io_u->offset > f->real_file_size) {
- if (buflen == td->min_bs[ddir])
+ if (buflen == td->o.min_bs[ddir]) {
+ if (!td->o.odirect) {
+ assert(io_u->offset <= f->real_file_size);
+ buflen = f->real_file_size - io_u->offset;
+ return buflen;
+ }
return 0;
+ }
- buflen = td->min_bs[ddir];
+ buflen = td->o.min_bs[ddir];
}
return buflen;
}
+static void set_rwmix_bytes(struct thread_data *td)
+{
+ unsigned long long rbytes;
+ unsigned int diff;
+
+ /*
+ * we do time or byte based switch. this is needed because
+ * buffered writes may issue a lot quicker than they complete,
+ * whereas reads do not.
+ */
+ rbytes = td->io_bytes[td->rwmix_ddir] - td->rwmix_bytes;
+ diff = td->o.rwmixread;
+ if (td->rwmix_ddir == DDIR_WRITE)
+ diff = 100 - diff;
+
+ td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * (100 - diff)) / diff;
+}
+
/*
* Return the data direction for the next io_u. If the job is a
* mixed read/write workload, check the rwmix cycle and switch if
if (td_rw(td)) {
struct timeval now;
unsigned long elapsed;
+ unsigned int cycle;
fio_gettime(&now, NULL);
elapsed = mtime_since_now(&td->rwmix_switch);
+ cycle = td->o.rwmixcycle;
+ if (!td->rwmix_bytes)
+ cycle /= 10;
+
/*
* Check if it's time to seed a new data direction.
*/
- if (elapsed >= td->rwmixcycle) {
+ if (elapsed >= cycle &&
+ td->io_bytes[td->rwmix_ddir] >= td->rwmix_bytes) {
unsigned int v;
long r;
r = os_random_long(&td->rwmix_state);
v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0)));
- if (v < td->rwmixread)
+ if (v < td->o.rwmixread) {
+ if (td->rwmix_ddir != DDIR_READ)
+ set_rwmix_bytes(td);
td->rwmix_ddir = DDIR_READ;
- else
+ } else {
+ if (td->rwmix_ddir != DDIR_WRITE)
+ set_rwmix_bytes(td);
td->rwmix_ddir = DDIR_WRITE;
+ }
memcpy(&td->rwmix_switch, &now, sizeof(now));
}
return td->rwmix_ddir;
/*
* If using an iolog, grab next piece if any available.
*/
- if (td->read_iolog)
+ if (td->o.read_iolog)
return read_iolog_get(td, io_u);
/*
* see if it's time to sync
*/
- if (td->fsync_blocks && !(td->io_issues[DDIR_WRITE] % td->fsync_blocks)
- && td->io_issues[DDIR_WRITE] && should_fsync(td)) {
+ if (td->o.fsync_blocks &&
+ !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
+ td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
return 0;
}
/*
* mark entry before potentially trimming io_u
*/
- if (!td->read_iolog && td_random(td) && !td->norandommap)
+ if (!td->o.read_iolog && td_random(td) && !td->o.norandommap)
mark_random_map(td, io_u);
/*
* If using a write iolog, store this entry.
*/
- if (td->write_iolog_file)
+ if (td->o.write_iolog_file)
write_iolog_put(td, io_u);
return 0;
}
-static void io_u_mark_depth(struct thread_data *td)
+void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
{
int index = 0;
+ if (io_u->ddir == DDIR_SYNC)
+ return;
+
switch (td->cur_depth) {
default:
index++;
}
td->ts.io_u_map[index]++;
- td->ts.total_io_u++;
+ td->ts.total_io_u[io_u->ddir]++;
}
static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
/*
* Get next file to service by choosing one at random
*/
-static struct fio_file *get_next_file_rand(struct thread_data *td)
+static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
+ int badf)
{
- unsigned int fileno;
struct fio_file *f;
+ int fno;
do {
long r = os_random_long(&td->next_file_state);
- fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
- f = &td->files[fileno];
- if (f->fd != -1)
+ fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
+ f = &td->files[fno];
+
+ if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
return f;
} while (1);
}
/*
* Get next file to service by doing round robin between all available ones
*/
-static struct fio_file *get_next_file_rr(struct thread_data *td)
+static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
+ int badf)
{
unsigned int old_next_file = td->next_file;
struct fio_file *f;
f = &td->files[td->next_file];
td->next_file++;
- if (td->next_file >= td->nr_files)
+ if (td->next_file >= td->o.nr_files)
td->next_file = 0;
- if (f->fd != -1)
+ if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
break;
f = NULL;
static struct fio_file *get_next_file(struct thread_data *td)
{
+ struct fio_file *f;
+
+ assert(td->o.nr_files <= td->files_index);
+
if (!td->nr_open_files)
return NULL;
- if (td->file_service_type == FIO_FSERVICE_RR)
- return get_next_file_rr(td);
+ f = td->file_service_file;
+ if (f && (f->flags & FIO_FILE_OPEN) && td->file_service_left--)
+ return f;
+
+ if (td->o.file_service_type == FIO_FSERVICE_RR)
+ f = get_next_file_rr(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
else
- return get_next_file_rand(td);
+ f = get_next_file_rand(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+
+ td->file_service_file = f;
+ td->file_service_left = td->file_service_nr - 1;
+ return f;
+}
+
+static struct fio_file *find_next_new_file(struct thread_data *td)
+{
+ struct fio_file *f;
+
+ if (td->o.file_service_type == FIO_FSERVICE_RR)
+ f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
+ else
+ f = get_next_file_rand(td, 0, FIO_FILE_OPEN);
+
+ return f;
}
struct io_u *__get_io_u(struct thread_data *td)
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_busylist);
td->cur_depth++;
- io_u_mark_depth(td);
}
return io_u;
{
struct fio_file *f;
struct io_u *io_u;
+ int ret;
io_u = __get_io_u(td);
if (!io_u)
return NULL;
}
+set_file:
io_u->file = f;
if (!fill_io_u(td, io_u))
* No more to do for this file, close it
*/
io_u->file = NULL;
- close_file(td, f);
+ td_io_close_file(td, f);
+
+ /*
+ * 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->zone_size) {
+ if (td->zone_bytes >= td->o.zone_size) {
td->zone_bytes = 0;
- f->last_pos += td->zone_skip;
+ f->last_pos += td->o.zone_skip;
}
if (io_u->buflen + io_u->offset > f->real_file_size) {
f->last_pos = io_u->offset + io_u->buflen;
- if (td->verify != VERIFY_NONE)
+ if (td->o.verify != VERIFY_NONE)
populate_verify_io_u(td, io_u);
}
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;
return;
}
- log_err("fio: io_u timeout: job=%s, pid=%d\n", td->name, td->pid);
+ log_err("fio: io_u timeout: job=%s, pid=%d\n", td->o.name, td->pid);
list_for_each(entry, &td->io_u_busylist) {
io_u = list_entry(entry, struct io_u, list);