ccan/io: rewrite.

[ccan] / ccan / io / test / run-10-many.c

diff --git a/ccan/io/test/run-10-many.c b/ccan/io/test/run-10-many.c
index 53e971d0e284ef0775e520114230fa25e89746f4..b70310dd865ed3eaa0047216dbad941e6169a19a 100644 (file)
--- a/ccan/io/test/run-10-many.c
+++ b/ccan/io/test/run-10-many.c
@@ -15,44 +15,49 @@ struct buffer {
        char buf[32];
 };
 
-static struct io_plan 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_plan *poke_writer(struct io_conn *conn, struct buffer *buf);
 
-static struct io_plan read_buf(struct io_conn *conn, struct buffer *buf)
+static struct io_plan *read_buf(struct io_conn *conn, struct buffer *buf)
 {
-       return io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf);
+       return io_read(conn, &buf->buf, sizeof(buf->buf), poke_writer, buf);
 }
 
-static struct io_plan 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();
+               return io_close(conn);
 
        /* You write. */
        io_wake(&buf->writer);
 
        /* I'll wait until you wake me. */
-       return io_wait(&buf->reader, read_buf, buf);
+       return io_wait(conn, &buf->reader, IO_IN, read_buf, buf);
 }
 
-static struct io_plan write_buf(struct io_conn *conn, struct buffer *buf)
+static struct io_plan *write_buf(struct io_conn *conn, struct buffer *buf)
 {
-       return io_write(&buf->buf, sizeof(buf->buf), poke_reader, buf);
+       return io_write(conn, &buf->buf, sizeof(buf->buf), poke_reader, buf);
 }
 
-static struct io_plan 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);
 
        if (++buf->iters == NUM_ITERS)
-               return io_close();
+               return io_close(conn);
 
        /* I'll wait until you tell me to write. */
-       return io_wait(&buf->writer, write_buf, buf);
+       return io_wait(conn, &buf->writer, IO_OUT, write_buf, buf);
+}
+
+static struct io_plan *setup_reader(struct io_conn *conn, struct buffer *buf)
+{
+       return io_wait(conn, &buf->reader, IO_IN, read_buf, buf);
 }
 
 static struct buffer buf[NUM];
@@ -75,12 +80,11 @@ int main(void)
                sprintf(buf[i].buf, "%i-%i", i, i);
 
                /* Wait for writer to tell us to read. */
-               buf[i].reader = io_new_conn(last_read,
-                                           io_wait(&buf[i].reader, read_buf,
-                                                   &buf[i]));
+               buf[i].reader = io_new_conn(NULL, last_read,
+                                           setup_reader, &buf[i]);
                if (!buf[i].reader)
                        break;
-               buf[i].writer = io_new_conn(fds[1], write_buf(NULL, &buf[i]));
+               buf[i].writer = io_new_conn(NULL, fds[1], write_buf, &buf[i]);
                if (!buf[i].writer)
                        break;
                last_read = fds[0];
@@ -91,10 +95,9 @@ int main(void)
        /* Last one completes the cirle. */
        i = 0;
        sprintf(buf[i].buf, "%i-%i", i, i);
-       buf[i].reader = io_new_conn(last_read,
-                                   io_wait(&buf[i].reader, read_buf, &buf[i]));
+       buf[i].reader = io_new_conn(NULL, last_read, setup_reader, &buf[i]);
        ok1(buf[i].reader);
-       buf[i].writer = io_new_conn(last_write, write_buf(NULL, &buf[i]));
+       buf[i].writer = io_new_conn(NULL, last_write, write_buf, &buf[i]);
        ok1(buf[i].writer);
 
        /* They should eventually exit */