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 plan_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(&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);
+ 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(conn, NULL);
+ return io_close(conn);
/* You write. */
- io_wake(buf->writer, plan_write, buf);
+ io_wake(&buf->writer);
/* I'll wait until you wake me. */
- return io_idle();
+ return io_wait(conn, &buf->reader, read_buf, buf);
+}
+
+static struct io_plan *write_buf(struct io_conn *conn, struct buffer *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, plan_read, buf);
+ io_wake(&buf->reader);
if (++buf->iters == NUM_ITERS)
- return io_close(conn, NULL);
+ return io_close(conn);
/* I'll wait until you tell me to write. */
- return io_idle();
+ return io_wait(conn, &buf->writer, write_buf, buf);
}
-static struct io_plan reader(struct io_conn *conn, struct buffer *buf)
+static struct io_plan *setup_reader(struct io_conn *conn, struct buffer *buf)
{
- assert(conn == buf->reader);
-
- /* Wait for writer to tell us to read. */
- return io_idle();
+ return io_wait(conn, &buf->reader, read_buf, buf);
}
static struct buffer buf[NUM];
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(NULL, last_read,
+ setup_reader, &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(NULL, fds[1], write_buf, &buf[i]);
if (!buf[i].writer)
break;
last_read = fds[0];
/* 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(NULL, last_read, setup_reader, &buf[i]);
ok1(buf[i].reader);
- buf[i].writer = io_new_conn(last_write, plan_write, NULL, &buf[i]);
+ buf[i].writer = io_new_conn(NULL, last_write, write_buf, &buf[i]);
ok1(buf[i].writer);
/* They should eventually exit */
- ok1(io_loop() == NULL);
+ ok1(io_loop(NULL, NULL) == NULL);
for (i = 0; i < NUM; i++) {
char b[sizeof(buf[0].buf)];