io: change io_idle() to io_wait()
[ccan] / ccan / io / test / run-10-many.c
index 1c39635b62ff674e6b961402d49af94881696f2b..53e971d0e284ef0775e520114230fa25e89746f4 100644 (file)
@@ -16,34 +16,43 @@ struct buffer {
 };
 
 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)
+{
+       return io_read(&buf->buf, sizeof(buf->buf), poke_writer, 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,
-               io_write(&buf->buf, sizeof(buf->buf), poke_reader, buf));
+       io_wake(&buf->writer);
 
        /* I'll wait until you wake me. */
-       return io_idle();
+       return io_wait(&buf->reader, read_buf, 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. */
-       io_wake(buf->reader,
-               io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf));
+       io_wake(&buf->reader);
 
        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();
+       return io_wait(&buf->writer, write_buf, buf);
 }
 
 static struct buffer buf[NUM];
@@ -66,14 +75,12 @@ 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_idle(), NULL, &buf[i]);
+               buf[i].reader = io_new_conn(last_read,
+                                           io_wait(&buf[i].reader, read_buf,
+                                                   &buf[i]));
                if (!buf[i].reader)
                        break;
-               buf[i].writer = io_new_conn(fds[1],
-                                           io_write(&buf[i].buf,
-                                                    sizeof(buf[i].buf),
-                                                    poke_reader, &buf[i]),
-                                           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];
@@ -84,12 +91,10 @@ 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_idle(), NULL, NULL);
+       buf[i].reader = io_new_conn(last_read,
+                                   io_wait(&buf[i].reader, read_buf, &buf[i]));
        ok1(buf[i].reader);
-       buf[i].writer = io_new_conn(last_write,
-                                   io_write(&buf[i].buf, sizeof(buf[i].buf),
-                                            poke_reader, &buf[i]),
-                                   NULL, NULL);
+       buf[i].writer = io_new_conn(last_write, write_buf(NULL, &buf[i]));
        ok1(buf[i].writer);
 
        /* They should eventually exit */