X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsync.c;h=5e49429306e11c405f6285b95145fd03496ddbb2;hp=6a5b7d391ed206a465f8b2d1cbd7fcf550305c8f;hb=2bd3eabc6ed08bf0ede81928396ac2db096480a1;hpb=36167d82e5f49dee91c6d2cd426068edee90e36f

diff --git a/engines/sync.c b/engines/sync.c
index 6a5b7d39..5e494293 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -1,5 +1,8 @@
 /*
- * regular read/write sync io engine
+ * sync/psync engine
+ *
+ * IO engine that does regular read(2)/write(2) with lseek(2) to transfer
+ * data and IO engine that does regular pread(2)/pwrite(2) to transfer data.
  *
  */
 #include <stdio.h>
@@ -9,7 +12,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
@@ -21,27 +23,17 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 		return 0;
 
 	if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "lseek");
 		return 1;
 	}
 
 	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;
-
-	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) {
+		if (ret >= 0) {
 			io_u->resid = io_u->xfer_buflen - ret;
 			io_u->error = 0;
 			return FIO_Q_COMPLETED;
@@ -50,25 +42,72 @@ static int fio_syncio_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, "xfer");
 
 	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,
 	.queue		= fio_syncio_queue,
+	.open_file	= generic_open_file,
+	.close_file	= generic_close_file,
+	.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)
 {
-	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);
 }