X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fmmap.c;h=5b55a811511d594cc5f84c86e828da7a6157c800;hp=17cf5fcfc9964efa53c91877ec05fc7c3c56e6ae;hb=12d9d841526ad75a67bb43a90edeefd05f85f11e;hpb=da751ca9665bcdeca56d2eec5b629a0953c07662

diff --git a/engines/mmap.c b/engines/mmap.c
index 17cf5fcf..5b55a811 100644
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -9,23 +9,23 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
 #include <sys/mman.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 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;
 
+	fio_ro_check(td, io_u);
+
 	if (io_u->ddir == DDIR_READ)
 		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->xfer_buf, io_u->xfer_buflen);
 	else if (io_u->ddir == DDIR_SYNC) {
-		size_t len = (f->file_size + page_size - 1) & ~page_mask;
+		size_t len = (f->io_size + page_size - 1) & ~page_mask;
 
 		if (msync(f->mmap, len, MS_SYNC)) {
 			io_u->error = errno;
@@ -36,7 +36,7 @@ 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 (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;
 
@@ -61,17 +61,23 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 	if (ret)
 		return ret;
 
+	/*
+	 * for size checkup, don't mmap anything.
+	 */
+	if (!f->io_size)
+		return 0;
+
 	if (td_rw(td))
 		flags = PROT_READ | PROT_WRITE;
 	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;
 
-	f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
+	f->mmap = mmap(NULL, f->io_size, flags, MAP_SHARED, f->fd, f->file_offset);
 	if (f->mmap == MAP_FAILED) {
 		f->mmap = NULL;
 		td_verror(td, errno, "mmap");
@@ -82,12 +88,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 		goto err;
 
 	if (!td_random(td)) {
-		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
+		if (madvise(f->mmap, f->io_size, MADV_SEQUENTIAL) < 0) {
 			td_verror(td, errno, "madvise");
 			goto err;
 		}
 	} else {
-		if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
+		if (madvise(f->mmap, f->io_size, MADV_RANDOM) < 0) {
 			td_verror(td, errno, "madvise");
 			goto err;
 		}
@@ -100,14 +106,23 @@ err:
 	return 1;
 }
 
-static void fio_mmapio_close(struct thread_data fio_unused *td,
-			     struct fio_file *f)
+static int fio_mmapio_close(struct thread_data fio_unused *td,
+			    struct fio_file *f)
 {
+	int ret = 0, ret2;
+
 	if (f->mmap) {
-		munmap(f->mmap, f->file_size);
+		if (munmap(f->mmap, f->io_size) < 0)
+			ret = errno;
+
 		f->mmap = NULL;
 	}
-	generic_close_file(td, f);
+
+	ret2 = generic_close_file(td, f);
+	if (!ret && ret2)
+		ret = ret2;
+
+	return ret;
 }
 
 static struct ioengine_ops ioengine = {