ccan/io: get rid of io_next(), pass callbacks directly.

[ccan] / ccan / io / benchmarks / run-loop.c

diff --git a/ccan/io/benchmarks/run-loop.c b/ccan/io/benchmarks/run-loop.c
index 9af564c736d3a226535d9e13c14fd1d8df312177..5dc1c3e11b628743165c0b2f160a04cd2fee976b 100644 (file)
--- a/ccan/io/benchmarks/run-loop.c
+++ b/ccan/io/benchmarks/run-loop.c
@@ -16,26 +16,24 @@ 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_writer(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)
+static struct io_plan *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));
+       return io_read(conn, &buf->buf, sizeof(buf->buf), poke_writer, buf);
 }
 
-static struct io_op *do_write(struct io_conn *conn, struct buffer *buf)
+static struct io_plan *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));
+       return io_write(conn, &buf->buf, sizeof(buf->buf), 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);
 
@@ -49,7 +47,7 @@ static struct io_op *poke_writer(struct io_conn *conn, struct buffer *buf)
        return io_idle(conn);
 }
 
-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. */
@@ -62,7 +60,7 @@ static struct io_op *poke_reader(struct io_conn *conn, struct buffer *buf)
        return io_idle(conn);
 }
 
-static struct io_op *reader(struct io_conn *conn, struct buffer *buf)
+static struct io_plan *reader(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->reader);