return (f->file_map[idx] & (1UL << bit)) == 0;
}
+/*
+ * Mark a given offset as used in the map.
+ */
+static void mark_random_map(struct thread_data *td, struct fio_file *f,
+ struct io_u *io_u)
+{
+ unsigned int min_bs = td->min_bs[io_u->ddir];
+ unsigned long long block;
+ unsigned int blocks;
+
+ block = io_u->offset / (unsigned long long) min_bs;
+ blocks = 0;
+ while (blocks < (io_u->buflen / min_bs)) {
+ unsigned int idx, bit;
+
+ if (!random_map_free(td, f, block))
+ break;
+
+ idx = RAND_MAP_IDX(td, f, block);
+ bit = RAND_MAP_BIT(td, f, block);
+
+ assert(idx < f->num_maps);
+
+ f->file_map[idx] |= (1UL << bit);
+ block++;
+ blocks++;
+ }
+
+ if ((blocks * min_bs) < io_u->buflen)
+ io_u->buflen = blocks * min_bs;
+}
+
/*
* Return the next free block in the map.
*/
*b = 0;
i = 0;
- while ((*b) * td->min_bs < f->file_size) {
+ while ((*b) * td->rw_min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
*b += ffz(f->file_map[i]);
return 0;
* the last io issued.
*/
static int get_next_offset(struct thread_data *td, struct fio_file *f,
- unsigned long long *offset)
+ unsigned long long *offset, int ddir)
{
unsigned long long b, rb;
long r;
if (!td->sequential) {
- unsigned long long max_blocks = td->io_size / td->min_bs;
+ unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
int loops = 50;
do {
r = os_random_long(&td->random_state);
b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
- rb = b + (f->file_offset / td->min_bs);
+ if (td->norandommap)
+ break;
+ rb = b + (f->file_offset / td->min_bs[ddir]);
loops--;
} while (!random_map_free(td, f, rb) && loops);
return 1;
}
} else
- b = f->last_pos / td->min_bs;
+ b = f->last_pos / td->min_bs[ddir];
- *offset = (b * td->min_bs) + f->file_offset;
- if (*offset > f->file_size)
+ *offset = (b * td->min_bs[ddir]) + f->file_offset;
+ if (*offset > f->real_file_size)
return 1;
return 0;
}
-static unsigned int get_next_buflen(struct thread_data *td)
+static unsigned int get_next_buflen(struct thread_data *td, int ddir)
{
unsigned int buflen;
long r;
- if (td->min_bs == td->max_bs)
- buflen = td->min_bs;
+ if (td->min_bs[ddir] == td->max_bs[ddir])
+ buflen = td->min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
- buflen = (1 + (double) (td->max_bs - 1) * r / (RAND_MAX + 1.0));
- buflen = (buflen + td->min_bs - 1) & ~(td->min_bs - 1);
+ 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);
}
- if (buflen > td->io_size - td->this_io_bytes[td->ddir]) {
+ if (buflen > td->io_size - td->this_io_bytes[ddir]) {
/*
* 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;
- buflen = td->io_size - td->this_io_bytes[td->ddir];
+ buflen = td->io_size - td->this_io_bytes[ddir];
}
return buflen;
* mixed read/write workload, check the rwmix cycle and switch if
* necessary.
*/
-static int get_rw_ddir(struct thread_data *td)
+static enum fio_ddir get_rw_ddir(struct thread_data *td)
{
if (td_rw(td)) {
struct timeval now;
unsigned long elapsed;
- gettimeofday(&now, NULL);
+ fio_gettime(&now, NULL);
elapsed = mtime_since_now(&td->rwmix_switch);
/*
return DDIR_WRITE;
}
-/*
- * Mark a given offset as used in the map.
- */
-static void mark_random_map(struct thread_data *td, struct fio_file *f,
- struct io_u *io_u)
-{
- unsigned long long block = io_u->offset / (unsigned long long) td->min_bs;
- unsigned int blocks = 0;
-
- while (blocks < (io_u->buflen / td->min_bs)) {
- unsigned int idx, bit;
-
- if (!random_map_free(td, f, block))
- break;
-
- idx = RAND_MAP_IDX(td, f, block);
- bit = RAND_MAP_BIT(td, f, block);
-
- assert(idx < f->num_maps);
-
- f->file_map[idx] |= (1UL << bit);
- block++;
- blocks++;
- }
-
- if ((blocks * td->min_bs) < io_u->buflen)
- io_u->buflen = blocks * td->min_bs;
-}
-
void put_io_u(struct thread_data *td, struct io_u *io_u)
{
io_u->file = NULL;
return read_iolog_get(td, io_u);
/*
- * No log, let the seq/rand engine retrieve the next position.
+ * see if it's time to sync
*/
- if (!get_next_offset(td, f, &io_u->offset)) {
- io_u->buflen = get_next_buflen(td);
+ if (td->fsync_blocks && !(td->io_blocks[DDIR_WRITE] % td->fsync_blocks)
+ && should_fsync(td)) {
+ io_u->ddir = DDIR_SYNC;
+ io_u->file = f;
+ return 0;
+ }
- if (io_u->buflen) {
- io_u->ddir = get_rw_ddir(td);
+ io_u->ddir = get_rw_ddir(td);
+ /*
+ * No log, let the seq/rand engine retrieve the next position.
+ */
+ if (!get_next_offset(td, f, &io_u->offset, io_u->ddir)) {
+ io_u->buflen = get_next_buflen(td, io_u->ddir);
+ if (io_u->buflen) {
/*
* If using a write iolog, store this entry.
*/
- if (td->write_iolog)
+ if (td->write_iolog_file)
write_iolog_put(td, io_u);
io_u->file = f;
if (!queue_full(td)) {
io_u = list_entry(td->io_u_freelist.next, struct io_u, list);
+ io_u->buflen = 0;
io_u->error = 0;
io_u->resid = 0;
list_del(&io_u->list);
return NULL;
}
- if (io_u->buflen + io_u->offset > f->file_size) {
+ if (io_u->buflen + io_u->offset > f->real_file_size) {
if (td->io_ops->flags & FIO_RAWIO) {
put_io_u(td, io_u);
return NULL;
}
- io_u->buflen = f->file_size - io_u->offset;
+ io_u->buflen = f->real_file_size - io_u->offset;
}
- if (!io_u->buflen) {
- put_io_u(td, io_u);
- return NULL;
- }
+ if (io_u->ddir != DDIR_SYNC) {
+ if (!io_u->buflen) {
+ put_io_u(td, io_u);
+ return NULL;
+ }
- if (!td->read_iolog && !td->sequential)
- mark_random_map(td, f, io_u);
+ if (!td->read_iolog && !td->sequential && !td->norandommap)
+ mark_random_map(td, f, io_u);
- f->last_pos += io_u->buflen;
+ f->last_pos += io_u->buflen;
- if (td->verify != VERIFY_NONE)
- populate_verify_io_u(td, io_u);
+ if (td->verify != VERIFY_NONE)
+ populate_verify_io_u(td, io_u);
+ }
if (td_io_prep(td, io_u)) {
put_io_u(td, io_u);
return NULL;
}
- gettimeofday(&io_u->start_time, NULL);
+ fio_gettime(&io_u->start_time, NULL);
return io_u;
}
void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
- struct timeval e;
unsigned long msec;
- gettimeofday(&e, NULL);
+ if (io_u->ddir == DDIR_SYNC) {
+ td->last_was_sync = 1;
+ return;
+ }
+
+ td->last_was_sync = 0;
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
- const int idx = io_u->ddir;
+ const enum fio_ddir idx = io_u->ddir;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
- msec = mtime_since(&io_u->issue_time, &e);
+ io_u->file->last_completed_pos = io_u->offset + io_u->buflen;
+
+ msec = mtime_since(&io_u->issue_time, &icd->time);
add_clat_sample(td, idx, msec);
- add_bw_sample(td, idx);
+ add_bw_sample(td, idx, &icd->time);
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
struct io_u *io_u;
int i;
+ fio_gettime(&icd->time, NULL);
+
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;