X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsplice.c;h=b92da4a85577d1d945b354699861ff412ef6b1d7;hb=104bc4bdf55bd79c2b3f9087601c3df4aa884b2a;hp=026a82bb053b538ac61f83ed721f8ca4448fb8a1;hpb=cec6b55da1c282b5b91ad346c7804171fccf151e;p=fio.git

diff --git a/engines/splice.c b/engines/splice.c
index 026a82bb..b92da4a8 100644
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -1,5 +1,8 @@
 /*
- * splice io engine
+ * splice engine
+ *
+ * IO engine that transfers data by doing splices to/from pipes and
+ * the files.
  *
  */
 #include <stdio.h>
@@ -10,39 +13,13 @@
 #include <sys/poll.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_SPLICE
 
 struct spliceio_data {
-	struct io_u *last_io_u;
 	int pipe[2];
 };
 
-static int fio_spliceio_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_spliceio_event(struct thread_data *td, int event)
-{
-	struct spliceio_data *sd = td->io_ops->data;
-
-	assert(event == 0);
-
-	return sd->last_io_u;
-}
-
 /*
  * For splice reading, we unfortunately cannot (yet) vmsplice the other way.
  * So just splice the data from the file into the pipe, and use regular
@@ -70,7 +47,7 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 			if (errno == ENODATA || errno == EAGAIN)
 				continue;
 
-			return errno;
+			return -errno;
 		}
 
 		buflen -= ret;
@@ -78,7 +55,7 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 		while (ret) {
 			ret2 = read(sd->pipe[0], p, ret);
 			if (ret2 < 0)
-				return errno;
+				return -errno;
 
 			ret -= ret2;
 			p += ret2;
@@ -112,7 +89,7 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 
 		ret = vmsplice(sd->pipe[1], iov, 1, SPLICE_F_NONBLOCK);
 		if (ret < 0)
-			return errno;
+			return -errno;
 
 		iov[0].iov_len -= ret;
 		iov[0].iov_base += ret;
@@ -120,7 +97,7 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 		while (ret) {
 			ret2 = splice(sd->pipe[0], NULL, f->fd, &off, ret, 0);
 			if (ret2 < 0)
-				return errno;
+				return -errno;
 
 			ret -= ret2;
 		}
@@ -131,7 +108,6 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
-	struct spliceio_data *sd = td->io_ops->data;
 	int ret;
 
 	if (io_u->ddir == DDIR_READ)
@@ -142,18 +118,18 @@ static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 		ret = fsync(io_u->file->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;
+	if (io_u->error)
+		td_verror(td, io_u->error, "xfer");
 
-	return io_u->error;
+	return FIO_Q_COMPLETED;
 }
 
 static void fio_spliceio_cleanup(struct thread_data *td)
@@ -172,9 +148,8 @@ static int fio_spliceio_init(struct thread_data *td)
 {
 	struct spliceio_data *sd = malloc(sizeof(*sd));
 
-	sd->last_io_u = NULL;
 	if (pipe(sd->pipe) < 0) {
-		td_verror(td, errno);
+		td_verror(td, errno, "pipe");
 		free(sd);
 		return 1;
 	}
@@ -188,9 +163,9 @@ static struct ioengine_ops ioengine = {
 	.version	= FIO_IOOPS_VERSION,
 	.init		= fio_spliceio_init,
 	.queue		= fio_spliceio_queue,
-	.getevents	= fio_spliceio_getevents,
-	.event		= fio_spliceio_event,
 	.cleanup	= fio_spliceio_cleanup,
+	.open_file	= generic_open_file,
+	.close_file	= generic_close_file,
 	.flags		= FIO_SYNCIO,
 };