[PATCH] Implement file syncing as data direction
Instead of defining a seperate ->sync() operation for the io engine,
reuse the io_u infrastructure for committing and reaping sync
events as well. It's a nice cleanup as well.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/engines/fio-engine-mmap.c b/engines/fio-engine-mmap.c
index d203d6a..c85f661 100644
--- a/engines/fio-engine-mmap.c
+++ b/engines/fio-engine-mmap.c
@@ -48,8 +48,10 @@
if (io_u->ddir == DDIR_READ)
memcpy(io_u->buf, f->mmap + real_off, io_u->buflen);
- else
+ else if (io_u->ddir == DDIR_WRITE)
memcpy(f->mmap + real_off, io_u->buf, io_u->buflen);
+ else if (io_u->ddir == DDIR_SYNC)
+ return msync(f->mmap, f->file_size, MS_SYNC);
/*
* not really direct, but should drop the pages from the cache
@@ -67,12 +69,6 @@
return io_u->error;
}
-static int fio_mmapio_sync(struct thread_data fio_unused *td,
- struct fio_file *f)
-{
- return msync(f->mmap, f->file_size, MS_SYNC);
-}
-
static void fio_mmapio_cleanup(struct thread_data *td)
{
if (td->io_ops->data) {
@@ -98,6 +94,5 @@
.getevents = fio_mmapio_getevents,
.event = fio_mmapio_event,
.cleanup = fio_mmapio_cleanup,
- .sync = fio_mmapio_sync,
.flags = FIO_SYNCIO | FIO_MMAPIO,
};