sync engine: cleanup psync/sync seperation

[fio.git] / engines / sync.c

diff --git a/engines/sync.c b/engines/sync.c
index 597ee0127a39d1a5d30f0609d366b3fb5d9230e7..5e49429306e11c405f6285b95145fd03496ddbb2 100644 (file)
--- 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
  *
  * 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>
  *
  */
 #include <stdio.h>


@@ -30,20 +30,8 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
        return 0;
 }
 

-static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
+static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret)

 {
 {

-       struct fio_file *f = io_u->file;
-       int ret;
-
-       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
-               ret = fsync(f->fd);
-

        if (ret != (int) io_u->xfer_buflen) {
                if (ret >= 0) {
                        io_u->resid = io_u->xfer_buflen - ret;
        if (ret != (int) io_u->xfer_buflen) {
                if (ret >= 0) {
                        io_u->resid = io_u->xfer_buflen - ret;


@@ -59,7 +47,41 @@ static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
        return FIO_Q_COMPLETED;
 }
 
        return FIO_Q_COMPLETED;
 }
 

-static struct ioengine_ops ioengine = {
+static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
+{
+       struct fio_file *f = io_u->file;
+       int ret;
+
+       fio_ro_check(td, io_u);
+
+       if (io_u->ddir == DDIR_READ)
+               ret = pread(f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
+       else if (io_u->ddir == DDIR_WRITE)
+               ret = pwrite(f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
+       else
+               ret = fsync(f->fd);
+
+       return fio_io_end(td, io_u, ret);
+}
+
+static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
+{
+       struct fio_file *f = io_u->file;
+       int ret;
+
+       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
+               ret = fsync(f->fd);
+
+       return fio_io_end(td, io_u, ret);
+}
+
+static struct ioengine_ops ioengine_rw = {

        .name           = "sync",
        .version        = FIO_IOOPS_VERSION,
        .prep           = fio_syncio_prep,
        .name           = "sync",
        .version        = FIO_IOOPS_VERSION,
        .prep           = fio_syncio_prep,


@@ -69,12 +91,23 @@ static struct ioengine_ops ioengine = {
        .flags          = FIO_SYNCIO,
 };
 
        .flags          = FIO_SYNCIO,
 };
 

+static struct ioengine_ops ioengine_prw = {
+       .name           = "psync",
+       .version        = FIO_IOOPS_VERSION,
+       .queue          = fio_psyncio_queue,
+       .open_file      = generic_open_file,
+       .close_file     = generic_close_file,
+       .flags          = FIO_SYNCIO,
+};
+

 static void fio_init fio_syncio_register(void)
 {
 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)
 {
 }
 
 static void fio_exit fio_syncio_unregister(void)
 {

-       unregister_ioengine(&ioengine);
+       unregister_ioengine(&ioengine_rw);
+       unregister_ioengine(&ioengine_prw);

 }
 }