syslet: we have fls(), use it for rounding ring size up

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 34ae91671a4348c43bacdf9f7eddc2f5e81f020d..9aacc335d906b21b4b5c397c8d26049338bc1b42 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -157,13 +157,15 @@ void close_ioengine(struct thread_data *td)
 
 int td_io_prep(struct thread_data *td, struct io_u *io_u)
 {
+       fio_ro_check(td, io_u);
+
        if (td->io_ops->prep)
                return td->io_ops->prep(td, io_u);
 
        return 0;
 }
 
-int td_io_getevents(struct thread_data *td, int min, int max,
+int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
                    struct timespec *t)
 {
        if (min > 0 && td->io_ops->commit) {
@@ -182,6 +184,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
        int ret;
 
+       fio_ro_check(td, io_u);
+
        assert((io_u->flags & IO_U_F_FLIGHT) == 0);
        io_u->flags |= IO_U_F_FLIGHT;
 
@@ -192,6 +196,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        if (td->io_ops->flags & FIO_SYNCIO) {
                fio_gettime(&io_u->issue_time, NULL);
+               memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
 
                /*
                 * for a sync engine, set the timeout upfront
@@ -207,9 +212,6 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        ret = td->io_ops->queue(td, io_u);
 
-       if (ret == FIO_Q_QUEUED || ret == FIO_Q_COMPLETED)
-               get_file(io_u->file);
-
        if (ret == FIO_Q_QUEUED) {
                int r;
 
@@ -223,6 +225,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
                fio_gettime(&io_u->issue_time, NULL);
+               memcpy(&td->last_issue, &io_u->issue_time, sizeof(struct timeval));
 
                /*
                 * async engine, set the timeout here
@@ -242,7 +245,7 @@ int td_io_init(struct thread_data *td)
        if (td->io_ops->init) {
                ret = td->io_ops->init(td);
                if (ret && td->o.iodepth > 1)
-                       log_err("fio: io engine init failed. Perhaps try reducing io dpeth?\n");
+                       log_err("fio: io engine init failed. Perhaps try reducing io depth?\n");
        }
 
        return ret;
@@ -280,7 +283,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 
        f->last_free_lookup = 0;
        f->last_completed_pos = 0;
-       f->last_pos = 0;
+       f->last_pos = f->file_offset;
        f->flags |= FIO_FILE_OPEN;
        f->flags &= ~FIO_FILE_CLOSING;
 
@@ -310,6 +313,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                memset(f->file_map, 0, f->num_maps * sizeof(long));
 
 done:
+       log_file(td, f, FIO_LOG_OPEN_FILE);
        td->nr_open_files++;
        get_file(f);
        return 0;
@@ -321,6 +325,9 @@ err:
 
 void td_io_close_file(struct thread_data *td, struct fio_file *f)
 {
+       if (!(f->flags & FIO_FILE_CLOSING))
+               log_file(td, f, FIO_LOG_CLOSE_FILE);
+
        /*
         * mark as closing, do real close when last io on it has completed
         */