Merge branch 'master' of https://github.com/bvanassche/fio

[fio.git] / rate-submit.c

diff --git a/rate-submit.c b/rate-submit.c
index 0c31f29f5aaafcc27c7dce14d66072f5c5567b08..5c77a4e8ecb83089ad2fb6a0322aafcbcab2bc4c 100644 (file)
--- a/rate-submit.c
+++ b/rate-submit.c
@@ -5,7 +5,7 @@
  *
  */
 #include "fio.h"
-#include "ioengine.h"
+#include "ioengines.h"
 #include "lib/getrusage.h"
 #include "rate-submit.h"
 
@@ -19,7 +19,7 @@ static int io_workqueue_fn(struct submit_worker *sw,
 
        dprint(FD_RATE, "io_u %p queued by %u\n", io_u, gettid());
 
-       io_u_set(io_u, IO_U_F_NO_FILE_PUT);
+       io_u_set(td, io_u, IO_U_F_NO_FILE_PUT);
 
        td->cur_depth++;
 
@@ -30,7 +30,7 @@ static int io_workqueue_fn(struct submit_worker *sw,
                ret = io_u_queued_complete(td, 1);
                if (ret > 0)
                        td->cur_depth -= ret;
-               io_u_clear(io_u, IO_U_F_FLIGHT);
+               io_u_clear(td, io_u, IO_U_F_FLIGHT);
        } while (1);
 
        dprint(FD_RATE, "io_u %p ret %d by %u\n", io_u, ret, gettid());
@@ -98,7 +98,6 @@ static int io_workqueue_init_worker_fn(struct submit_worker *sw)
 {
        struct thread_data *parent = sw->wq->td;
        struct thread_data *td = sw->priv;
-       int fio_unused ret;
 
        memcpy(&td->o, &parent->o, sizeof(td->o));
        memcpy(&td->ts, &parent->ts, sizeof(td->ts));
@@ -110,23 +109,19 @@ static int io_workqueue_init_worker_fn(struct submit_worker *sw)
        if (ioengine_load(td))
                goto err;
 
-       if (td->o.odirect)
-               td->io_ops->flags |= FIO_RAWIO;
-
        td->pid = gettid();
 
        INIT_FLIST_HEAD(&td->io_log_list);
        INIT_FLIST_HEAD(&td->io_hist_list);
        INIT_FLIST_HEAD(&td->verify_list);
        INIT_FLIST_HEAD(&td->trim_list);
-       INIT_FLIST_HEAD(&td->next_rand_list);
        td->io_hist_tree = RB_ROOT;
 
        td->o.iodepth = 1;
        if (td_io_init(td))
                goto err_io_init;
 
-       fio_gettime(&td->epoch, NULL);
+       set_epoch_time(td, td->o.log_unix_epoch);
        fio_getrusage(&td->ru_start);
        clear_io_state(td, 1);