X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsync.c;h=597ee0127a39d1a5d30f0609d366b3fb5d9230e7;hp=94dd71049f0cb1cf85f355ba210754150b1eec64;hb=7101d9c24abec4be58a086d85d6d92ec6e6492e9;hpb=cec6b55da1c282b5b91ad346c7804171fccf151e

diff --git a/engines/sync.c b/engines/sync.c
index 94dd7104..597ee012 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -1,5 +1,8 @@
 /*
- * regular read/write sync io engine
+ * sync engine
+ *
+ * IO engine that does regular read(2)/write(2) with lseek(2) to transfer
+ * data.
  *
  */
 #include <stdio.h>
@@ -9,35 +12,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
-
-struct syncio_data {
-	struct io_u *last_io_u;
-};
-
-static int fio_syncio_getevents(struct thread_data *td, int fio_unused min,
-				int max, struct timespec fio_unused *t)
-{
-	assert(max <= 1);
-
-	/*
-	 * we can only have one finished io_u for sync io, since the depth
-	 * is always 1
-	 */
-	if (list_empty(&td->io_u_busylist))
-		return 0;
-
-	return 1;
-}
-
-static struct io_u *fio_syncio_event(struct thread_data *td, int event)
-{
-	struct syncio_data *sd = td->io_ops->data;
-
-	assert(event == 0);
-
-	return sd->last_io_u;
-}
 
 static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
@@ -49,7 +23,7 @@ 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;
 	}
 
@@ -58,10 +32,11 @@ 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;
 	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)
@@ -70,46 +45,27 @@ static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
 		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 ret;
+			return FIO_Q_COMPLETED;
 		} else
 			io_u->error = errno;
 	}
 
-	if (!io_u->error)
-		sd->last_io_u = io_u;
-
-	return io_u->error;
-}
-
-static void fio_syncio_cleanup(struct thread_data *td)
-{
-	if (td->io_ops->data) {
-		free(td->io_ops->data);
-		td->io_ops->data = NULL;
-	}
-}
-
-static int fio_syncio_init(struct thread_data *td)
-{
-	struct syncio_data *sd = malloc(sizeof(*sd));
+	if (io_u->error)
+		td_verror(td, io_u->error, "xfer");
 
-	sd->last_io_u = NULL;
-	td->io_ops->data = sd;
-	return 0;
+	return FIO_Q_COMPLETED;
 }
 
 static struct ioengine_ops ioengine = {
 	.name		= "sync",
 	.version	= FIO_IOOPS_VERSION,
-	.init		= fio_syncio_init,
 	.prep		= fio_syncio_prep,
 	.queue		= fio_syncio_queue,
-	.getevents	= fio_syncio_getevents,
-	.event		= fio_syncio_event,
-	.cleanup	= fio_syncio_cleanup,
+	.open_file	= generic_open_file,
+	.close_file	= generic_close_file,
 	.flags		= FIO_SYNCIO,
 };