X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fmmap.c;h=bb4a81a5a54f8eb2c3a047f866b624deea39cc7a;hb=0263882a95b9213d3afe285ae8adb5d0310d5039;hp=08bbd991463d4e8546ea40a31d14b9213ffd0d11;hpb=948f9b2eed7aeee6367957ea30be7a2da94d5b1b;p=fio.git

diff --git a/engines/mmap.c b/engines/mmap.c
index 08bbd991..bb4a81a5 100644
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -37,39 +37,75 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 	}
 
 	if (io_u->error)
-		td_verror(td, io_u->error);
+		td_verror(td, io_u->error, "sync");
 
 	return FIO_Q_COMPLETED;
 }
 
-static int fio_mmapio_init(struct thread_data *td)
+static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 {
-	struct fio_file *f;
-	int i;
+	int ret, flags;
 
-	if (td->ddir == DDIR_READ && !td_rw(td))
-		return 0;
+	ret = generic_open_file(td, f);
+	if (ret)
+		return ret;
 
-	/*
-	 * 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);
-			return 1;
+	if (td_rw(td))
+		flags = PROT_READ | PROT_WRITE;
+	else if (td_write(td)) {
+		flags = PROT_WRITE;
+
+		if (td->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);
+	if (f->mmap == MAP_FAILED) {
+		f->mmap = NULL;
+		td_verror(td, errno, "mmap");
+		goto err;
+	}
+
+	if (file_invalidate_cache(td, f))
+		goto err;
+
+	if (!td_random(td)) {
+		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
+			td_verror(td, errno, "madvise");
+			goto err;
+		}
+	} else {
+		if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
+			td_verror(td, errno, "madvise");
+			goto err;
 		}
 	}
 
 	return 0;
+
+err:
+	td->io_ops->close_file(td, f);
+	return 1;
+}
+
+static void fio_mmapio_close(struct thread_data fio_unused *td,
+			     struct fio_file *f)
+{
+	if (f->mmap) {
+		munmap(f->mmap, f->file_size);
+		f->mmap = NULL;
+	}
+	generic_close_file(td, f);
 }
 
 static struct ioengine_ops ioengine = {
 	.name		= "mmap",
 	.version	= FIO_IOOPS_VERSION,
 	.queue		= fio_mmapio_queue,
-	.init		= fio_mmapio_init,
-	.flags		= FIO_SYNCIO | FIO_MMAPIO,
+	.open_file	= fio_mmapio_open,
+	.close_file	= fio_mmapio_close,
+	.flags		= FIO_SYNCIO | FIO_NOEXTEND,
 };
 
 static void fio_init fio_mmapio_register(void)