X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Ffio-engine-sync.c;h=c7ddd4c52956125bd408e4c6f2a0d86f95908041;hp=abc29f40f9a27a613c43127aec31372ffad634b5;hb=1e97cce9f5a87a67293a05ec4533ed6968698b2e;hpb=2866c82d598e30604d8a92723c664ee6ced90fb0

diff --git a/engines/fio-engine-sync.c b/engines/fio-engine-sync.c
index abc29f40..c7ddd4c5 100644
--- a/engines/fio-engine-sync.c
+++ b/engines/fio-engine-sync.c
@@ -7,18 +7,14 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
-#include "fio.h"
-#include "os.h"
+
+#include "../fio.h"
+#include "../os.h"
 
 struct syncio_data {
 	struct io_u *last_io_u;
 };
 
-static int fio_syncio_sync(struct thread_data *td)
-{
-	return fsync(td->fd);
-}
-
 static int fio_syncio_getevents(struct thread_data *td, int fio_unused min,
 				int max, struct timespec fio_unused *t)
 {
@@ -45,7 +41,14 @@ static struct io_u *fio_syncio_event(struct thread_data *td, int event)
 
 static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
-	if (lseek(td->fd, io_u->offset, SEEK_SET) == -1) {
+	struct fio_file *f = io_u->file;
+
+	if (io_u->ddir == DDIR_SYNC)
+		return 0;
+	if (io_u->offset == f->last_completed_pos)
+		return 0;
+
+	if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
 		td_verror(td, errno);
 		return 1;
 	}
@@ -56,14 +59,17 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
 {
 	struct syncio_data *sd = td->io_ops->data;
-	int ret;
+	struct fio_file *f = io_u->file;
+	unsigned int ret;
 
 	if (io_u->ddir == DDIR_READ)
-		ret = read(td->fd, io_u->buf, io_u->buflen);
+		ret = read(f->fd, io_u->buf, io_u->buflen);
+	else if (io_u->ddir == DDIR_WRITE)
+		ret = write(f->fd, io_u->buf, io_u->buflen);
 	else
-		ret = write(td->fd, io_u->buf, io_u->buflen);
+		ret = fsync(f->fd);
 
-	if ((unsigned int) ret != io_u->buflen) {
+	if (ret != io_u->buflen) {
 		if (ret > 0) {
 			io_u->resid = io_u->buflen - ret;
 			io_u->error = EIO;
@@ -94,7 +100,7 @@ static int fio_syncio_init(struct thread_data *td)
 	return 0;
 }
 
-struct ioengine_ops ioengine = {
+static struct ioengine_ops ioengine = {
 	.name		= "sync",
 	.version	= FIO_IOOPS_VERSION,
 	.init		= fio_syncio_init,
@@ -103,6 +109,15 @@ struct ioengine_ops ioengine = {
 	.getevents	= fio_syncio_getevents,
 	.event		= fio_syncio_event,
 	.cleanup	= fio_syncio_cleanup,
-	.sync		= fio_syncio_sync,
 	.flags		= FIO_SYNCIO,
 };
+
+static void fio_init fio_syncio_register(void)
+{
+	register_ioengine(&ioengine);
+}
+
+static void fio_exit fio_syncio_unregister(void)
+{
+	unregister_ioengine(&ioengine);
+}