struct io_completion_data {
int nr; /* input */
- endio_handler *handler; /* input */
int error; /* output */
unsigned long bytes_done[2]; /* output */
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;
{
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--;
/*
* mark entry before potentially trimming io_u
*/
- if (!td->read_iolog && !td->sequential && !td->norandommap)
+ if (!td->read_iolog && td_random(td) && !td->norandommap)
mark_random_map(td, f, io_u);
/*
td->io_u_lat[index]++;
}
-static struct fio_file *get_next_file(struct thread_data *td)
+/*
+ * Get next file to service by choosing one at random
+ */
+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 {
+ fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+ f = &td->files[fileno];
+ if (f->fd != -1)
+ 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)
{
unsigned int old_next_file = td->next_file;
struct fio_file *f;
io_u->buflen = 0;
io_u->resid = 0;
io_u->file = NULL;
+ io_u->end_io = NULL;
}
if (io_u) {
if (io_u->file)
goto out;
- f = get_next_file(td);
+ if (td->file_service_type == FIO_FSERVICE_RR)
+ f = get_next_file_rr(td);
+ else
+ f = get_next_file_rand(td);
+
if (!f) {
put_io_u(td, io_u);
return NULL;
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;
}
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;
/*
* 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);
/*
* 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;
} 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];