Add pread/pwrite support to sync engine
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/engines/sync.c b/engines/sync.c
index 597ee01..3cd4e90 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -1,8 +1,8 @@
/*
- * sync engine
+ * sync/psync engine
*
* IO engine that does regular read(2)/write(2) with lseek(2) to transfer
- * data.
+ * data and IO engine that does regular pread(2)/pwrite(2) to transfer data.
*
*/
#include <stdio.h>
@@ -13,6 +13,8 @@
#include "../fio.h"
+#define is_psync(td) ((td)->io_ops->data == (void *) 1)
+
static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
{
struct fio_file *f = io_u->file;
@@ -37,11 +39,17 @@
fio_ro_check(td, io_u);
- if (io_u->ddir == DDIR_READ)
- ret = read(f->fd, io_u->xfer_buf, io_u->xfer_buflen);
- else if (io_u->ddir == DDIR_WRITE)
- ret = write(f->fd, io_u->xfer_buf, io_u->xfer_buflen);
- else
+ if (io_u->ddir == DDIR_READ) {
+ if (is_psync(td))
+ ret = pread(f->fd, io_u->xfer_buf, io_u->xfer_buflen,io_u->offset);
+ else
+ ret = read(f->fd, io_u->xfer_buf, io_u->xfer_buflen);
+ } else if (io_u->ddir == DDIR_WRITE) {
+ if (is_psync(td))
+ ret = pwrite(f->fd, io_u->xfer_buf, io_u->xfer_buflen,io_u->offset);
+ else
+ ret = write(f->fd, io_u->xfer_buf, io_u->xfer_buflen);
+ } else
ret = fsync(f->fd);
if (ret != (int) io_u->xfer_buflen) {
@@ -59,7 +67,13 @@
return FIO_Q_COMPLETED;
}
-static struct ioengine_ops ioengine = {
+static int fio_psyncio_init(struct thread_data *td)
+{
+ td->io_ops->data = (void *) 1;
+ return 0;
+}
+
+static struct ioengine_ops ioengine_rw = {
.name = "sync",
.version = FIO_IOOPS_VERSION,
.prep = fio_syncio_prep,
@@ -69,12 +83,24 @@
.flags = FIO_SYNCIO,
};
+static struct ioengine_ops ioengine_prw = {
+ .name = "psync",
+ .version = FIO_IOOPS_VERSION,
+ .queue = fio_syncio_queue,
+ .init = fio_psyncio_init,
+ .open_file = generic_open_file,
+ .close_file = generic_close_file,
+ .flags = FIO_SYNCIO,
+};
+
static void fio_init fio_syncio_register(void)
{
- register_ioengine(&ioengine);
+ register_ioengine(&ioengine_rw);
+ register_ioengine(&ioengine_prw);
}
static void fio_exit fio_syncio_unregister(void)
{
- unregister_ioengine(&ioengine);
+ unregister_ioengine(&ioengine_rw);
+ unregister_ioengine(&ioengine_prw);
}