X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=6df4b5eee80190187aa0015b11aca7da73e714b4;hp=6fb754e7f44701cbfddc628abe4f7164eeccd1aa;hb=5af1c6f3b46b40ef6b7021a34fd38889226e137f;hpb=0aabe160c38efc3c42157fac2a9af08e070341c6 diff --git a/io_u.c b/io_u.c index 6fb754e7..6df4b5ee 100644 --- a/io_u.c +++ b/io_u.c @@ -15,7 +15,6 @@ struct io_completion_data { int nr; /* input */ - endio_handler *handler; /* input */ int error; /* output */ unsigned long bytes_done[2]; /* output */ @@ -38,10 +37,10 @@ static int random_map_free(struct thread_data *td, struct fio_file *f, /* * 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) +static void mark_random_map(struct thread_data *td, struct io_u *io_u) { unsigned int min_bs = td->rw_min_bs; + struct fio_file *f = io_u->file; unsigned long long block; unsigned int blocks; unsigned int nr_blocks; @@ -99,14 +98,14 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f, * until we find a free one. For sequential io, just return the end of * the last io issued. */ -static int get_next_offset(struct thread_data *td, struct fio_file *f, - struct io_u *io_u) +static int get_next_offset(struct thread_data *td, struct io_u *io_u) { + struct fio_file *f = io_u->file; const int ddir = io_u->ddir; unsigned long long b, rb; long r; - if (!td->sequential) { + if (td_random(td)) { unsigned long long max_blocks = f->file_size / td->min_bs[ddir]; int loops = 5; @@ -135,9 +134,9 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f, return 0; } -static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f, - struct io_u *io_u) +static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u) { + struct fio_file *f = io_u->file; const int ddir = io_u->ddir; unsigned int buflen; long r; @@ -212,14 +211,16 @@ void requeue_io_u(struct thread_data *td, struct io_u **io_u) { struct io_u *__io_u = *io_u; + __io_u->flags |= IO_U_F_FREE; + __io_u->flags &= ~IO_U_F_FLIGHT; + list_del(&__io_u->list); list_add_tail(&__io_u->list, &td->io_u_requeues); td->cur_depth--; *io_u = NULL; } -static int fill_io_u(struct thread_data *td, struct fio_file *f, - struct io_u *io_u) +static int fill_io_u(struct thread_data *td, struct io_u *io_u) { /* * If using an iolog, grab next piece if any available. @@ -233,7 +234,6 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f, if (td->fsync_blocks && !(td->io_issues[DDIR_WRITE] % td->fsync_blocks) && td->io_issues[DDIR_WRITE] && should_fsync(td)) { io_u->ddir = DDIR_SYNC; - io_u->file = f; return 0; } @@ -243,18 +243,18 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f, * No log, let the seq/rand engine retrieve the next buflen and * position. */ - if (get_next_offset(td, f, io_u)) + if (get_next_offset(td, io_u)) return 1; - io_u->buflen = get_next_buflen(td, f, io_u); + io_u->buflen = get_next_buflen(td, io_u); if (!io_u->buflen) return 1; /* * mark entry before potentially trimming io_u */ - if (!td->read_iolog && !td->sequential && !td->norandommap) - mark_random_map(td, f, io_u); + if (!td->read_iolog && td_random(td) && !td->norandommap) + mark_random_map(td, io_u); /* * If using a write iolog, store this entry. @@ -262,7 +262,6 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f, if (td->write_iolog_file) write_iolog_put(td, io_u); - io_u->file = f; return 0; } @@ -330,11 +329,12 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec) */ static struct fio_file *get_next_file_rand(struct thread_data *td) { - long r = os_random_long(&td->next_file_state); unsigned int fileno; struct fio_file *f; 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) @@ -366,6 +366,17 @@ static struct fio_file *get_next_file_rr(struct thread_data *td) return f; } +static struct fio_file *get_next_file(struct thread_data *td) +{ + if (!td->nr_open_files) + return NULL; + + if (td->file_service_type == FIO_FSERVICE_RR) + return get_next_file_rr(td); + else + return get_next_file_rand(td); +} + struct io_u *__get_io_u(struct thread_data *td) { struct io_u *io_u = NULL; @@ -378,6 +389,7 @@ struct io_u *__get_io_u(struct thread_data *td) io_u->buflen = 0; io_u->resid = 0; io_u->file = NULL; + io_u->end_io = NULL; } if (io_u) { @@ -413,28 +425,30 @@ struct io_u *get_io_u(struct thread_data *td) if (io_u->file) goto out; - if (td->file_service_type == FIO_FSERVICE_RR) - f = get_next_file_rr(td); - else - f = get_next_file_rand(td); + do { + f = get_next_file(td); + if (!f) { + put_io_u(td, io_u); + return NULL; + } - if (!f) { - put_io_u(td, io_u); - return NULL; - } + io_u->file = f; - io_u->file = f; + if (!fill_io_u(td, io_u)) + break; + + /* + * No more to do for this file, close it + */ + io_u->file = NULL; + close_file(td, f); + } while (1); if (td->zone_bytes >= td->zone_size) { td->zone_bytes = 0; f->last_pos += td->zone_skip; } - if (fill_io_u(td, f, io_u)) { - put_io_u(td, io_u); - return NULL; - } - if (io_u->buflen + io_u->offset > f->real_file_size) { if (td->io_ops->flags & FIO_RAWIO) { put_io_u(td, io_u); @@ -510,8 +524,8 @@ static void io_completed(struct thread_data *td, struct io_u *io_u, icd->bytes_done[idx] += bytes; - if (icd->handler) { - ret = icd->handler(io_u); + if (io_u->end_io) { + ret = io_u->end_io(io_u); if (ret && !icd->error) icd->error = ret; } @@ -519,12 +533,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u, icd->error = io_u->error; } -static void init_icd(struct io_completion_data *icd, endio_handler *handler, - int nr) +static void init_icd(struct io_completion_data *icd, int nr) { fio_gettime(&icd->time, NULL); - icd->handler = handler; icd->nr = nr; icd->error = 0; @@ -548,12 +560,11 @@ static void ios_completed(struct thread_data *td, /* * Complete a single io_u for the sync engines. */ -long io_u_sync_complete(struct thread_data *td, struct io_u *io_u, - endio_handler *handler) +long io_u_sync_complete(struct thread_data *td, struct io_u *io_u) { struct io_completion_data icd; - init_icd(&icd, handler, 1); + init_icd(&icd, 1); io_completed(td, io_u, &icd); put_io_u(td, io_u); @@ -566,21 +577,13 @@ long io_u_sync_complete(struct thread_data *td, struct io_u *io_u, /* * Called to complete min_events number of io for the async engines. */ -long io_u_queued_complete(struct thread_data *td, int min_events, - endio_handler *handler) - +long io_u_queued_complete(struct thread_data *td, int min_events) { struct io_completion_data icd; struct timespec *tvp = NULL; int ret; - if (min_events > 0) { - ret = td_io_commit(td); - if (ret < 0) { - td_verror(td, -ret, "td_io_commit"); - return ret; - } - } else { + if (!min_events) { struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, }; tvp = &ts; @@ -593,7 +596,7 @@ long io_u_queued_complete(struct thread_data *td, int min_events, } else if (!ret) return ret; - init_icd(&icd, handler, ret); + init_icd(&icd, ret); ios_completed(td, &icd); if (!icd.error) return icd.bytes_done[0] + icd.bytes_done[1];