ccan/io: initialize connection with an explicit I/O plan.

[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 95a716e2263d26bc65e91d82f818d6a29c276509..1c39635b62ff674e6b961402d49af94881696f2b 100644 (file)
--- a/ccan/io/test/run-10-many.c
+++ b/ccan/io/test/run-10-many.c
@@ -15,23 +15,8 @@ struct buffer {
        char buf[32];
 };
 
-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 plan_read(struct io_conn *conn, struct buffer *buf)
-{
-       assert(conn == buf->reader);
-
-       return io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf);
-}
-
-static struct io_plan plan_write(struct io_conn *conn, struct buffer *buf)
-{
-       assert(conn == buf->writer);
-
-       return io_write(&buf->buf, sizeof(buf->buf), poke_reader, buf);
-}
-
 static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->reader);
@@ -40,7 +25,8 @@ static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf)
                return io_close(conn, NULL);
 
        /* You write. */
-       io_wake(buf->writer, plan_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();
@@ -50,7 +36,8 @@ static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)
 {
        assert(conn == buf->writer);
        /* You read. */
-       io_wake(buf->reader, plan_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);
@@ -59,14 +46,6 @@ static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)
        return io_idle();
 }
 
-static struct io_plan reader(struct io_conn *conn, struct buffer *buf)
-{
-       assert(conn == buf->reader);
-
-       /* Wait for writer to tell us to read. */
-       return io_idle();
-}
-
 static struct buffer buf[NUM];
 
 int main(void)
@@ -86,10 +65,15 @@ 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]);
+               /* Wait for writer to tell us to read. */
+               buf[i].reader = io_new_conn(last_read, io_idle(), NULL, &buf[i]);
                if (!buf[i].reader)
                        break;
-               buf[i].writer = io_new_conn(fds[1], plan_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]),
+                                           NULL, &buf[i]);
                if (!buf[i].writer)
                        break;
                last_read = fds[0];
@@ -100,9 +84,12 @@ 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, reader, NULL, &buf[i]);
+       buf[i].reader = io_new_conn(last_read, io_idle(), NULL, NULL);
        ok1(buf[i].reader);
-       buf[i].writer = io_new_conn(last_write, plan_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]),
+                                   NULL, NULL);
        ok1(buf[i].writer);
 
        /* They should eventually exit */