X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsync.c;h=3377f81a627f3578c713f049610151f8c7d218eb;hb=76cd9378b90dddf2cedc9a5d49f317aaad485b90;hp=505381d4ca942b932d7171393a2dc8f51c558726;hpb=1d2af02a16fc3c3561c994be4de887b926b2b774;p=fio.git

diff --git a/engines/sync.c b/engines/sync.c
index 505381d4..3377f81a 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/uio.h>
 #include <errno.h>
 #include <assert.h>
 
@@ -17,6 +18,7 @@ struct syncio_data {
 	struct iovec *iovecs;
 	struct io_u **io_us;
 	unsigned int queued;
+	unsigned int events;
 	unsigned long queued_bytes;
 
 	unsigned long long last_offset;
@@ -28,9 +30,10 @@ static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
 	struct fio_file *f = io_u->file;
 
-	if (io_u->ddir == DDIR_SYNC)
+	if (!ddir_rw(io_u->ddir))
 		return 0;
-	if (io_u->offset == f->last_completed_pos)
+
+	if (f->file_pos != -1ULL && f->file_pos == io_u->offset)
 		return 0;
 
 	if (lseek(f->fd, io_u->offset, SEEK_SET) == -1) {
@@ -43,6 +46,9 @@ static int fio_syncio_prep(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)
 {
+	if (io_u->file && ret >= 0 && ddir_rw(io_u->ddir))
+		io_u->file->file_pos = io_u->offset + ret;
+
 	if (ret != (int) io_u->xfer_buflen) {
 		if (ret >= 0) {
 			io_u->resid = io_u->xfer_buflen - ret;
@@ -69,8 +75,10 @@ static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
 		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 if (io_u->ddir == DDIR_TRIM)
+		ret = do_io_u_trim(td, io_u);
 	else
-		ret = fsync(f->fd);
+		ret = do_io_u_sync(td, io_u);
 
 	return fio_io_end(td, io_u, ret);
 }
@@ -86,8 +94,10 @@ static int fio_syncio_queue(struct thread_data *td, struct io_u *io_u)
 		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_TRIM)
+		ret = do_io_u_trim(td, io_u);
 	else
-		ret = fsync(f->fd);
+		ret = do_io_u_sync(td, io_u);
 
 	return fio_io_end(td, io_u, ret);
 }
@@ -100,8 +110,8 @@ static int fio_vsyncio_getevents(struct thread_data *td, unsigned int min,
 	int ret;
 
 	if (min) {
-		ret = sd->queued;
-		sd->queued = 0;
+		ret = sd->events;
+		sd->events = 0;
 	} else
 		ret = 0;
 
@@ -120,7 +130,7 @@ static int fio_vsyncio_append(struct thread_data *td, struct io_u *io_u)
 {
 	struct syncio_data *sd = td->io_ops->data;
 
-	if (io_u->ddir == DDIR_SYNC)
+	if (ddir_sync(io_u->ddir))
 		return 0;
 
 	if (io_u->offset == sd->last_offset && io_u->file == sd->last_file &&
@@ -131,11 +141,11 @@ static int fio_vsyncio_append(struct thread_data *td, struct io_u *io_u)
 }
 
 static void fio_vsyncio_set_iov(struct syncio_data *sd, struct io_u *io_u,
-				int index)
+				int idx)
 {
-	sd->io_us[index] = io_u;
-	sd->iovecs[index].iov_base = io_u->xfer_buf;
-	sd->iovecs[index].iov_len = io_u->xfer_buflen;
+	sd->io_us[idx] = io_u;
+	sd->iovecs[idx].iov_base = io_u->xfer_buf;
+	sd->iovecs[idx].iov_len = io_u->xfer_buflen;
 	sd->last_offset = io_u->offset + io_u->xfer_buflen;
 	sd->last_file = io_u->file;
 	sd->last_ddir = io_u->ddir;
@@ -157,6 +167,11 @@ static int fio_vsyncio_queue(struct thread_data *td, struct io_u *io_u)
 		 */
 		if (sd->queued)
 			return FIO_Q_BUSY;
+		if (ddir_sync(io_u->ddir)) {
+			int ret = do_io_u_sync(td, io_u);
+
+			return fio_io_end(td, io_u, ret);
+		}
 
 		sd->queued = 0;
 		sd->queued_bytes = 0;
@@ -227,6 +242,7 @@ static int fio_vsyncio_commit(struct thread_data *td)
 	if (!sd->queued)
 		return 0;
 
+	io_u_mark_submit(td, sd->queued);
 	f = sd->last_file;
 
 	if (lseek(f->fd, sd->io_us[0]->offset, SEEK_SET) == -1) {
@@ -242,6 +258,8 @@ static int fio_vsyncio_commit(struct thread_data *td)
 		ret = writev(f->fd, sd->iovecs, sd->queued);
 
 	dprint(FD_IO, "vsyncio_commit: %d\n", (int) ret);
+	sd->events = sd->queued;
+	sd->queued = 0;
 	return fio_vsyncio_end(td, ret);
 }
 
@@ -266,7 +284,6 @@ static void fio_vsyncio_cleanup(struct thread_data *td)
 	free(sd->iovecs);
 	free(sd->io_us);
 	free(sd);
-	td->io_ops->data = NULL;
 }
 
 static struct ioengine_ops ioengine_rw = {
@@ -276,6 +293,7 @@ static struct ioengine_ops ioengine_rw = {
 	.queue		= fio_syncio_queue,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 	.flags		= FIO_SYNCIO,
 };
 
@@ -285,6 +303,7 @@ static struct ioengine_ops ioengine_prw = {
 	.queue		= fio_psyncio_queue,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 	.flags		= FIO_SYNCIO,
 };
 
@@ -299,6 +318,7 @@ static struct ioengine_ops ioengine_vrw = {
 	.getevents	= fio_vsyncio_getevents,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 	.flags		= FIO_SYNCIO,
 };