Add few debug statements and limit thread usage.

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index bb4a81a5a54f8eb2c3a047f866b624deea39cc7a..556e56de0e0289444965fc43e53d85f0e9dd25a9 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -1,5 +1,8 @@
 /*
- * regular read/write sync io engine
+ * mmap engine
+ *
+ * IO engine that reads/writes from files by doing memcpy to/from
+ * a memory mapped region of the file.
  *
  */
 #include <stdio.h>
@@ -22,23 +25,31 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
        else if (io_u->ddir == DDIR_WRITE)
                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))
+               size_t len = (f->file_size + page_size - 1) & ~page_mask;
+
+               if (msync(f->mmap, len, MS_SYNC)) {
                        io_u->error = errno;
+                       td_verror(td, io_u->error, "msync");
+               }
        }
 
        /*
         * 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->xfer_buflen, MS_SYNC) < 0)
+       if (td->o.odirect && io_u->ddir != DDIR_SYNC) {
+               size_t len = (io_u->xfer_buflen + page_size - 1) & ~page_mask;
+               unsigned long long off = real_off & ~page_mask;
+
+               if (msync(f->mmap + off, len, MS_SYNC) < 0) {
                        io_u->error = errno;
-               if (madvise(f->mmap + real_off, io_u->xfer_buflen,  MADV_DONTNEED) < 0)
+                       td_verror(td, io_u->error, "msync");
+               }
+               if (madvise(f->mmap + off, len,  MADV_DONTNEED) < 0) {
                        io_u->error = errno;
+                       td_verror(td, io_u->error, "madvise");
+               }
        }
 
-       if (io_u->error)
-               td_verror(td, io_u->error, "sync");
-
        return FIO_Q_COMPLETED;
 }
 
@@ -55,7 +66,7 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
        else if (td_write(td)) {
                flags = PROT_WRITE;
 
-               if (td->verify != VERIFY_NONE)
+               if (td->o.verify != VERIFY_NONE)
                        flags |= PROT_READ;
        } else
                flags = PROT_READ;