X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsplice.c;h=5c4411cce3bcdfdecdfe3f40a5b2e0d3530fd66a;hp=fa4a6ee1db21ff192d811f1a95dfacc05de35483;hb=faf5c880f6ddcd44ff896ba1cf3da38b23fe0f39;hpb=f8fe35e8c9e88dd681ea151251d75f6116a958b4

diff --git a/engines/splice.c b/engines/splice.c
index fa4a6ee1..5c4411cc 100644
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -15,34 +15,9 @@
 #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
@@ -57,8 +32,8 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 	void *p;
 
 	offset = io_u->offset;
-	buflen = io_u->buflen;
-	p = io_u->buf;
+	buflen = io_u->xfer_buflen;
+	p = io_u->xfer_buf;
 	while (buflen) {
 		int this_len = buflen;
 
@@ -85,7 +60,7 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 		}
 	}
 
-	return io_u->buflen;
+	return io_u->xfer_buflen;
 }
 
 /*
@@ -97,8 +72,8 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 	struct spliceio_data *sd = td->io_ops->data;
 	struct iovec iov[1] = {
 		{
-			.iov_base = io_u->buf,
-			.iov_len = io_u->buflen,
+			.iov_base = io_u->xfer_buf,
+			.iov_len = io_u->xfer_buflen,
 		}
 	};
 	struct pollfd pfd = { .fd = sd->pipe[1], .events = POLLOUT, };
@@ -126,13 +101,12 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 		}
 	}
 
-	return io_u->buflen;
+	return io_u->xfer_buflen;
 }
 
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
-	struct spliceio_data *sd = td->io_ops->data;
-	unsigned int ret;
+	int ret;
 
 	if (io_u->ddir == DDIR_READ)
 		ret = fio_splice_read(td, io_u);
@@ -141,18 +115,19 @@ static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 	else
 		ret = fsync(io_u->file->fd);
 
-	if (ret != io_u->buflen) {
-		if (ret > 0) {
-			io_u->resid = io_u->buflen - ret;
-			io_u->error = ENODATA;
+	if (ret != (int) io_u->xfer_buflen) {
+		if (ret >= 0) {
+			io_u->resid = io_u->xfer_buflen - ret;
+			io_u->error = 0;
+			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);
 
-	return io_u->error;
+	return FIO_Q_COMPLETED;
 }
 
 static void fio_spliceio_cleanup(struct thread_data *td)
@@ -171,7 +146,6 @@ 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);
 		free(sd);
@@ -187,8 +161,6 @@ 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,
 	.flags		= FIO_SYNCIO,
 };