Add iops rate to ETA display

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 1e9018c4f6ee85bc5362aea312b9b2ec15a15978..40fd1968eb08b4a9e8d1bcd6108ab7b6f780d1fe 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -7,6 +7,7 @@
 
 #include "fio.h"
 #include "hash.h"
+#include "verify.h"
 
 struct io_completion_data {
        int nr;                         /* input */
@@ -318,7 +319,6 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
                 * Check if it's time to seed a new data direction.
                 */
                if (td->io_issues[td->rwmix_ddir] >= td->rwmix_issues) {
-                       unsigned long long max_bytes;
                        enum fio_ddir ddir;
 
                        /*
@@ -327,16 +327,6 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
                         * ranges too much
                         */
                        ddir = get_rand_ddir(td);
-                       max_bytes = td->this_io_bytes[ddir];
-                       if (max_bytes >=
-                           (td->o.size * td->o.rwmix[ddir] / 100)) {
-                               if (!td->rw_end_set[ddir]) {
-                                       td->rw_end_set[ddir] = 1;
-                                       fio_gettime(&td->rw_end[ddir], NULL);
-                               }
-
-                               ddir ^= 1;
-                       }
 
                        if (ddir != td->rwmix_ddir)
                                set_rwmix_bytes(td);
@@ -621,8 +611,8 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
 /*
  * Get next file to service by choosing one at random
  */
-static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
-                                          int badf)
+static struct fio_file *get_next_file_rand(struct thread_data *td, enum fio_file_flags goodf,
+                                          enum fio_file_flags badf)
 {
        struct fio_file *f;
        int fno;
@@ -634,10 +624,10 @@ static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
                fno = (unsigned int) ((double) td->o.nr_files
                        * (r / (OS_RAND_MAX + 1.0)));
                f = td->files[fno];
-               if (f->flags & FIO_FILE_DONE)
+               if (fio_file_done(f))
                        continue;
 
-               if (!(f->flags & FIO_FILE_OPEN)) {
+               if (!fio_file_open(f)) {
                        int err;
 
                        err = td_io_open_file(td, f);
@@ -674,12 +664,12 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
                        td->next_file = 0;
 
                dprint(FD_FILE, "trying file %s %x\n", f->file_name, f->flags);
-               if (f->flags & FIO_FILE_DONE) {
+               if (fio_file_done(f)) {
                        f = NULL;
                        continue;
                }
 
-               if (!(f->flags & FIO_FILE_OPEN)) {
+               if (!fio_file_open(f)) {
                        int err;
 
                        err = td_io_open_file(td, f);
@@ -721,7 +711,7 @@ static struct fio_file *get_next_file(struct thread_data *td)
        }
 
        f = td->file_service_file;
-       if (f && (f->flags & FIO_FILE_OPEN) && !(f->flags & FIO_FILE_CLOSING)) {
+       if (f && fio_file_open(f) && !fio_file_closing(f)) {
                if (td->o.file_service_type == FIO_FSERVICE_SEQ)
                        goto out;
                if (td->file_service_left--)
@@ -730,9 +720,9 @@ static struct fio_file *get_next_file(struct thread_data *td)
 
        if (td->o.file_service_type == FIO_FSERVICE_RR ||
            td->o.file_service_type == FIO_FSERVICE_SEQ)
-               f = get_next_file_rr(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+               f = get_next_file_rr(td, FIO_FILE_open, FIO_FILE_closing);
        else
-               f = get_next_file_rand(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+               f = get_next_file_rand(td, FIO_FILE_open, FIO_FILE_closing);
 
        td->file_service_file = f;
        td->file_service_left = td->file_service_nr - 1;
@@ -759,7 +749,7 @@ static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
                put_file_log(td, f);
                td_io_close_file(td, f);
                io_u->file = NULL;
-               f->flags |= FIO_FILE_DONE;
+               fio_file_set_done(f);
                td->nr_done_files++;
                dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name, td->nr_done_files, td->o.nr_files);
        } while (1);
@@ -829,7 +819,7 @@ struct io_u *get_io_u(struct thread_data *td)
        }
 
        f = io_u->file;
-       assert(f->flags & FIO_FILE_OPEN);
+       assert(fio_file_open(f));
 
        if (io_u->ddir != DDIR_SYNC) {
                if (!io_u->buflen && !(td->io_ops->flags & FIO_NOIO)) {
@@ -848,7 +838,6 @@ struct io_u *get_io_u(struct thread_data *td)
        /*
         * Set io data pointers.
         */
-       io_u->endpos = io_u->offset + io_u->buflen;
        io_u->xfer_buf = io_u->buf;
        io_u->xfer_buflen = io_u->buflen;