Requeue io_u flags fix

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index c93896001296419f1a348f2b5f9f46f660b0a366..372f46a0507ddd941f47ff9d38a16a6d745569ae 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -8,9 +8,13 @@
 #include "fio.h"
 #include "os.h"
 
+/*
+ * Change this define to play with the timeout handling
+ */
+#undef FIO_USE_TIMEOUT
+
 struct io_completion_data {
        int nr;                         /* input */
-       endio_handler *handler;         /* input */
 
        int error;                      /* output */
        unsigned long bytes_done[2];    /* output */
@@ -101,7 +105,7 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
        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;
 
@@ -207,6 +211,9 @@ 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--;
@@ -248,7 +255,7 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
        /*
         * 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);
 
        /*
@@ -320,7 +327,27 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
        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;
@@ -353,6 +380,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) {
@@ -388,7 +416,11 @@ struct io_u *get_io_u(struct thread_data *td)
        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;
@@ -481,8 +513,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;
                }
@@ -490,12 +522,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;
@@ -519,12 +549,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);
 
@@ -537,9 +566,7 @@ 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;
@@ -548,7 +575,7 @@ long io_u_queued_complete(struct thread_data *td, int min_events,
        if (min_events > 0) {
                ret = td_io_commit(td);
                if (ret < 0) {
-                       td_verror(td, -ret);
+                       td_verror(td, -ret, "td_io_commit");
                        return ret;
                }
        } else {
@@ -559,12 +586,12 @@ long io_u_queued_complete(struct thread_data *td, int min_events,
 
        ret = td_io_getevents(td, min_events, td->cur_depth, tvp);
        if (ret < 0) {
-               td_verror(td, -ret);
+               td_verror(td, -ret, "td_io_getevents");
                return ret;
        } 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];
@@ -595,6 +622,16 @@ void io_u_set_timeout(struct thread_data *td)
        setitimer(ITIMER_REAL, &td->timer, NULL);
        fio_gettime(&td->timeout_end, NULL);
 }
+
+static void io_u_dump(struct io_u *io_u)
+{
+       unsigned long t_start = mtime_since_now(&io_u->start_time);
+       unsigned long t_issue = mtime_since_now(&io_u->issue_time);
+
+       log_err("io_u=%p, t_start=%lu, t_issue=%lu\n", io_u, t_start, t_issue);
+       log_err("  buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf, io_u->xfer_buf, io_u->buflen, io_u->xfer_buflen, io_u->offset);
+       log_err("  ddir=%d, fname=%s\n", io_u->ddir, io_u->file->file_name);
+}
 #else
 void io_u_set_timeout(struct thread_data fio_unused *td)
 {
@@ -606,6 +643,8 @@ static void io_u_timeout_handler(int fio_unused sig)
 {
        struct thread_data *td, *__td;
        pid_t pid = getpid();
+       struct list_head *entry;
+       struct io_u *io_u;
        int i;
 
        log_err("fio: io_u timeout\n");
@@ -632,7 +671,14 @@ static void io_u_timeout_handler(int fio_unused sig)
        }
 
        log_err("fio: io_u timeout: job=%s, pid=%d\n", td->name, td->pid);
-       td->error = ETIMEDOUT;
+
+       list_for_each(entry, &td->io_u_busylist) {
+               io_u = list_entry(entry, struct io_u, list);
+
+               io_u_dump(io_u);
+       }
+
+       td_verror(td, ETIMEDOUT, "io_u timeout");
        exit(1);
 }
 #endif