Show IOPS as well as bw numbers

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 978771e1370378ada310bc303b686f20fd7a2763..69f2f19d426053d8fc487affc991534a55c3f4f9 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -265,10 +265,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
-static void io_u_mark_depth(struct thread_data *td)
+void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
 {
        int index = 0;
 
+       if (io_u->ddir == DDIR_SYNC)
+               return;
+
        switch (td->cur_depth) {
        default:
                index++;
@@ -286,8 +289,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[io_u->ddir]++;
 }
 
 static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
@@ -321,7 +324,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,14 +332,15 @@ 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 {
-               fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+               long r = os_random_long(&td->next_file_state);
+
+               fileno = (unsigned int) ((double) (td->open_files * r) / (RAND_MAX + 1.0));
                f = &td->files[fileno];
-               if (f->fd != -1)
+               if (f->open)
                        return f;
        } while (1);
 }
@@ -353,10 +357,10 @@ static struct fio_file *get_next_file_rr(struct thread_data *td)
                f = &td->files[td->next_file];
 
                td->next_file++;
-               if (td->next_file >= td->nr_files)
+               if (td->next_file >= td->open_files)
                        td->next_file = 0;
 
-               if (f->fd != -1)
+               if (f->open)
                        break;
 
                f = NULL;
@@ -367,13 +371,23 @@ static struct fio_file *get_next_file_rr(struct thread_data *td)
 
 static struct fio_file *get_next_file(struct thread_data *td)
 {
+       struct fio_file *f;
+
        if (!td->nr_open_files)
                return NULL;
 
+       f = td->file_service_file;
+       if (f && f->open && td->file_service_left--)
+               return f;
+
        if (td->file_service_type == FIO_FSERVICE_RR)
-               return get_next_file_rr(td);
+               f = get_next_file_rr(td);
        else
-               return get_next_file_rand(td);
+               f = get_next_file_rand(td);
+
+       td->file_service_file = f;
+       td->file_service_left = td->file_service_nr - 1;
+       return f;
 }
 
 struct io_u *__get_io_u(struct thread_data *td)
@@ -399,7 +413,6 @@ struct io_u *__get_io_u(struct thread_data *td)
                list_del(&io_u->list);
                list_add(&io_u->list, &td->io_u_busylist);
                td->cur_depth++;
-               io_u_mark_depth(td);
        }
 
        return io_u;
@@ -440,7 +453,21 @@ struct io_u *get_io_u(struct thread_data *td)
                 * No more to do for this file, close it
                 */
                io_u->file = NULL;
-               close_file(td, f);
+               td_io_close_file(td, f);
+
+               /*
+                * probably not the right place to do this, but see
+                * if we need to open a new file
+                */
+               if (td->nr_open_files < td->nr_files &&
+                   td->open_files != td->nr_files) {
+                       int ret = td_io_open_file(td, f);
+
+                       if (ret) {
+                               put_io_u(td, io_u);
+                               return NULL;
+                       }
+               }
        } while (1);
 
        if (td->zone_bytes >= td->zone_size) {
@@ -485,6 +512,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)
 {
@@ -528,8 +572,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)
@@ -570,6 +616,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;
 }
 
@@ -600,6 +647,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;
 }