io: change io_idle() to io_wait()

[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 b20b2285b9e9621673ba7f3318834d9ea191a8c9..53e971d0e284ef0775e520114230fa25e89746f4 100644 (file)
--- a/ccan/io/test/run-10-many.c
+++ b/ccan/io/test/run-10-many.c
@@ -15,58 +15,44 @@ struct buffer {
        char buf[32];
 };
 
        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 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 *do_read(struct io_conn *conn, struct buffer *buf)
+static struct io_plan read_buf(struct io_conn *conn, struct buffer *buf)

 {
 {

-       assert(conn == buf->reader);
-
-       return io_read(conn, &buf->buf, sizeof(buf->buf),
-                      poke_writer, buf);
-}
-
-static struct io_plan *do_write(struct io_conn *conn, struct buffer *buf)
-{
-       assert(conn == buf->writer);
-
-       return io_write(conn, &buf->buf, sizeof(buf->buf),
-                       poke_reader, buf);
+       return io_read(&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)
 {
        assert(conn == buf->reader);
 
        if (buf->iters == NUM_ITERS)

-               return io_close(conn, NULL);
+               return io_close();

 
        /* You write. */
 
        /* You write. */

-       io_wake(buf->writer, do_write, buf);
+       io_wake(&buf->writer);

 
        /* I'll wait until you wake me. */
 
        /* I'll wait until you wake me. */

-       return io_idle(conn);
+       return io_wait(&buf->reader, read_buf, buf);

 }
 
 }
 

-static struct io_plan *poke_reader(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);
+}
+
+static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)

 {
        assert(conn == buf->writer);
        /* You read. */
 {
        assert(conn == buf->writer);
        /* You read. */

-       io_wake(buf->reader, do_read, buf);
+       io_wake(&buf->reader);

 
        if (++buf->iters == NUM_ITERS)
 
        if (++buf->iters == NUM_ITERS)

-               return io_close(conn, NULL);
+               return io_close();

 
        /* I'll wait until you tell me to write. */
 
        /* I'll wait until you tell me to write. */

-       return io_idle(conn);
-}
-
-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(conn);
+       return io_wait(&buf->writer, write_buf, buf);

 }
 
 static struct buffer buf[NUM];
 }
 
 static struct buffer buf[NUM];


@@ -88,10 +74,13 @@ int main(void)
                memset(buf[i].buf, i, sizeof(buf[i].buf));
                sprintf(buf[i].buf, "%i-%i", i, i);
 
                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_wait(&buf[i].reader, read_buf,
+                                                   &buf[i]));

                if (!buf[i].reader)
                        break;
                if (!buf[i].reader)
                        break;

-               buf[i].writer = io_new_conn(fds[1], do_write, NULL, &buf[i]);
+               buf[i].writer = io_new_conn(fds[1], write_buf(NULL, &buf[i]));

                if (!buf[i].writer)
                        break;
                last_read = fds[0];
                if (!buf[i].writer)
                        break;
                last_read = fds[0];


@@ -102,9 +91,10 @@ int main(void)
        /* Last one completes the cirle. */
        i = 0;
        sprintf(buf[i].buf, "%i-%i", i, i);
        /* 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_wait(&buf[i].reader, read_buf, &buf[i]));

        ok1(buf[i].reader);
        ok1(buf[i].reader);

-       buf[i].writer = io_new_conn(last_write, do_write, NULL, &buf[i]);
+       buf[i].writer = io_new_conn(last_write, write_buf(NULL, &buf[i]));

        ok1(buf[i].writer);
 
        /* They should eventually exit */
        ok1(buf[i].writer);
 
        /* They should eventually exit */