One step closer to group reporting

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 426a5f8a38b49b1f2e7a1b18de199ddccf53a536..5b5802c15ecb9041db66ec5ba755f84c98198f9c 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -286,8 +286,8 @@ static void io_u_mark_depth(struct thread_data *td)
                break;
        }
 
-       td->io_u_map[index]++;
-       td->total_io_u++;
+       td->ts->io_u_map[index]++;
+       td->ts->total_io_u++;
 }
 
 static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
@@ -321,7 +321,7 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
                break;
        }
 
-       td->io_u_lat[index]++;
+       td->ts->io_u_lat[index]++;
 }
 
 /*
@@ -329,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)
@@ -365,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;
@@ -413,23 +425,24 @@ 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);
-
-       if (!f) {
-               put_io_u(td, io_u);
-               return NULL;
-       }
+       do {
+               f = get_next_file(td);
+               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;
 
-       if (fill_io_u(td, io_u)) {
-               put_io_u(td, io_u);
-               return NULL;
-       }
+               /*
+                * 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;
@@ -473,6 +486,23 @@ out:
        return io_u;
 }
 
+void io_u_log_error(struct thread_data *td, struct io_u *io_u)
+{
+       const char *msg[] = { "read", "write", "sync" };
+
+       log_err("fio: io_u error");
+
+       if (io_u->file)
+               log_err(" on file %s", io_u->file->file_name);
+
+       log_err(": %s\n", strerror(io_u->error));
+
+       log_err("     %s offset=%llu, buflen=%lu\n", msg[io_u->ddir], io_u->offset, io_u->xfer_buflen);
+
+       if (!td->error)
+               td_verror(td, io_u->error, "io_u error");
+}
+
 static void io_completed(struct thread_data *td, struct io_u *io_u,
                         struct io_completion_data *icd)
 {
@@ -516,8 +546,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
                        if (ret && !icd->error)
                                icd->error = ret;
                }
-       } else
+       } else {
                icd->error = io_u->error;
+               io_u_log_error(td, io_u);
+       }
 }
 
 static void init_icd(struct io_completion_data *icd, int nr)
@@ -558,6 +590,7 @@ long io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
        if (!icd.error)
                return icd.bytes_done[0] + icd.bytes_done[1];
 
+       td_verror(td, icd.error, "io_u_sync_complete");
        return -1;
 }
 
@@ -588,6 +621,7 @@ long io_u_queued_complete(struct thread_data *td, int min_events)
        if (!icd.error)
                return icd.bytes_done[0] + icd.bytes_done[1];
 
+       td_verror(td, icd.error, "io_u_queued_complete");
        return -1;
 }