Rate must always calculate bytes done

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index c93896001296419f1a348f2b5f9f46f660b0a366..48d407605738bc335ce7e9be2cf96f61a8c88979 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -8,6 +8,11 @@
 #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 */
@@ -101,7 +106,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;
 
@@ -248,7 +253,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 +325,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;
@@ -388,7 +413,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;
@@ -548,7 +577,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,7 +588,7 @@ 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;
@@ -595,6 +624,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 +645,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 +673,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