X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fbenchmarks%2Frun-loop.c;h=ef01cf6a94663597dec0b4f7d0fe63bbe9c02f7a;hb=5a510ed5696255910fd42adb47d7c1ffa728a116;hp=9af564c736d3a226535d9e13c14fd1d8df312177;hpb=8d97cddd18f504409ddb66dfe396798c99c2dfbd;p=ccan

diff --git a/ccan/io/benchmarks/run-loop.c b/ccan/io/benchmarks/run-loop.c
index 9af564c7..ef01cf6a 100644
--- a/ccan/io/benchmarks/run-loop.c
+++ b/ccan/io/benchmarks/run-loop.c
@@ -16,58 +16,35 @@ struct buffer {
 	char buf[32];
 };
 
-static struct io_op *poke_writer(struct io_conn *conn, struct buffer *buf);
-static struct io_op *poke_reader(struct io_conn *conn, struct buffer *buf);
+static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf);
 
-static struct io_op *do_read(struct io_conn *conn, struct buffer *buf)
-{
-	assert(conn == buf->reader);
-
-	return io_read(&buf->buf, sizeof(buf->buf),
-		       io_next(conn, poke_writer, buf));
-}
-
-static struct io_op *do_write(struct io_conn *conn, struct buffer *buf)
-{
-	assert(conn == buf->writer);
-
-	return io_write(&buf->buf, sizeof(buf->buf),
-			io_next(conn, poke_reader, buf));
-}
-
-static struct io_op *poke_writer(struct io_conn *conn, struct buffer *buf)
+static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf)
 {
 	assert(conn == buf->reader);
 
 	if (buf->iters == NUM_ITERS)
-		return io_close(conn, NULL);
+		return io_close();
 
 	/* You write. */
-	io_wake(buf->writer, do_write, buf);
+	io_wake(buf->writer,
+		io_write(&buf->buf, sizeof(buf->buf), poke_reader, buf));
 
 	/* I'll wait until you wake me. */
-	return io_idle(conn);
+	return io_idle();
 }
 
-static struct io_op *poke_reader(struct io_conn *conn, struct buffer *buf)
+static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)
 {
 	assert(conn == buf->writer);
 	/* You read. */
-	io_wake(buf->reader, do_read, buf);
+	io_wake(buf->reader,
+		io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf));
 
 	if (++buf->iters == NUM_ITERS)
-		return io_close(conn, NULL);
+		return io_close();
 
 	/* I'll wait until you tell me to write. */
-	return io_idle(conn);
-}
-
-static struct io_op *reader(struct io_conn *conn, struct buffer *buf)
-{
-	assert(conn == buf->reader);
-
-	/* Wait for writer to tell us to read. */
-	return io_idle(conn);
+	return io_idle();
 }
 
 int main(void)
@@ -89,10 +66,13 @@ int main(void)
 		memset(buf[i].buf, i, sizeof(buf[i].buf));
 		sprintf(buf[i].buf, "%i-%i", i, i);
 
-		buf[i].reader = io_new_conn(last_read, reader, NULL, &buf[i]);
+		buf[i].reader = io_new_conn(last_read, io_idle());
 		if (!buf[i].reader)
 			err(1, "Creating reader %i", i);
-		buf[i].writer = io_new_conn(fds[1], do_write, NULL, &buf[i]);
+		buf[i].writer = io_new_conn(fds[1],
+					    io_write(&buf[i].buf,
+						     sizeof(buf[i].buf),
+						     poke_reader, &buf[i]));
 		if (!buf[i].writer)
 			err(1, "Creating writer %i", i);
 		last_read = fds[0];
@@ -102,10 +82,12 @@ int main(void)
 	i = 0;
 	buf[i].iters = 0;
 	sprintf(buf[i].buf, "%i-%i", i, i);
-	buf[i].reader = io_new_conn(last_read, reader, NULL, &buf[i]);
+	buf[i].reader = io_new_conn(last_read, io_idle());
 	if (!buf[i].reader)
 		err(1, "Creating reader %i", i);
-	buf[i].writer = io_new_conn(last_write, do_write, NULL, &buf[i]);
+	buf[i].writer = io_new_conn(last_write, io_write(&buf[i].buf,
+							 sizeof(buf[i].buf),
+							 poke_reader, &buf[i]));
 	if (!buf[i].writer)
 		err(1, "Creating writer %i", i);