Rate must always calculate bytes done

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 20dcfd2264cb3afc981e371c9c89aa2c28c1a447..bd59b28a6cf99f0900f978d175cbb68c336dfa00 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -12,45 +12,15 @@
 #include "../fio.h"
 #include "../os.h"
 
-struct mmapio_data {
-       struct io_u *last_io_u;
-};
-
-static int fio_mmapio_getevents(struct thread_data *td, int fio_unused min,
-                               int max, struct timespec fio_unused *t)
-{
-       assert(max <= 1);
-
-       /*
-        * we can only have one finished io_u for sync io, since the depth
-        * is always 1
-        */
-       if (list_empty(&td->io_u_busylist))
-               return 0;
-
-       return 1;
-}
-
-static struct io_u *fio_mmapio_event(struct thread_data *td, int event)
-{
-       struct mmapio_data *sd = td->io_ops->data;
-
-       assert(event == 0);
-
-       return sd->last_io_u;
-}
-
-
 static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        unsigned long long real_off = io_u->offset - f->file_offset;
-       struct mmapio_data *sd = td->io_ops->data;
 
        if (io_u->ddir == DDIR_READ)
-               memcpy(io_u->buf, f->mmap + real_off, io_u->buflen);
+               memcpy(io_u->xfer_buf, f->mmap + real_off, io_u->xfer_buflen);
        else if (io_u->ddir == DDIR_WRITE)
-               memcpy(f->mmap + real_off, io_u->buf, io_u->buflen);
+               memcpy(f->mmap + real_off, io_u->xfer_buf, io_u->xfer_buflen);
        else if (io_u->ddir == DDIR_SYNC) {
                if (msync(f->mmap, f->file_size, MS_SYNC))
                        io_u->error = errno;
@@ -60,43 +30,45 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
         * not really direct, but should drop the pages from the cache
         */
        if (td->odirect && io_u->ddir != DDIR_SYNC) {
-               if (msync(f->mmap + real_off, io_u->buflen, MS_SYNC) < 0)
+               if (msync(f->mmap + real_off, io_u->xfer_buflen, MS_SYNC) < 0)
                        io_u->error = errno;
-               if (madvise(f->mmap + real_off, io_u->buflen,  MADV_DONTNEED) < 0)
+               if (madvise(f->mmap + real_off, io_u->xfer_buflen,  MADV_DONTNEED) < 0)
                        io_u->error = errno;
        }
 
-       if (!io_u->error)
-               sd->last_io_u = io_u;
+       if (io_u->error)
+               td_verror(td, io_u->error, "sync");
 
-       return io_u->error;
-}
-
-static void fio_mmapio_cleanup(struct thread_data *td)
-{
-       if (td->io_ops->data) {
-               free(td->io_ops->data);
-               td->io_ops->data = NULL;
-       }
+       return FIO_Q_COMPLETED;
 }
 
 static int fio_mmapio_init(struct thread_data *td)
 {
-       struct mmapio_data *sd = malloc(sizeof(*sd));
+       struct fio_file *f;
+       int i;
+
+       if (!td_write(td))
+               return 0;
+
+       /*
+        * We need to truncate the files to the right size, if
+        * we are writing to it.
+        */
+       for_each_file(td, f, i) {
+               if (ftruncate(f->fd, f->file_size) < 0) {
+                       td_verror(td, errno, "ftruncate");
+                       return 1;
+               }
+       }
 
-       sd->last_io_u = NULL;
-       td->io_ops->data = sd;
        return 0;
 }
 
 static struct ioengine_ops ioengine = {
        .name           = "mmap",
        .version        = FIO_IOOPS_VERSION,
-       .init           = fio_mmapio_init,
        .queue          = fio_mmapio_queue,
-       .getevents      = fio_mmapio_getevents,
-       .event          = fio_mmapio_event,
-       .cleanup        = fio_mmapio_cleanup,
+       .init           = fio_mmapio_init,
        .flags          = FIO_SYNCIO | FIO_MMAPIO,
 };