ccan/io: eliminate dir argument from io_wait and io_always.

[ccan] / ccan / io / test / run-06-idle.c

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index 314293a5f0f2b5d6a145c8b38359056bf4a6bc0a..d01cb31fff4da1393e6d4071bc5b059ad7ff0326 100644 (file)
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -9,6 +9,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifndef PORT
+#define PORT "65006"
+#endif
+
 static struct io_conn *idler;
 
 struct data {
@@ -16,55 +20,58 @@ struct data {
        char buf[4];
 };
 
-static struct io_plan plan_read(struct io_conn *conn, struct data *d)
+static struct io_plan *read_done(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 2 || d->state == 3);
        d->state++;
-       return io_read(d->buf, sizeof(d->buf), io_close, d);
+       return io_close(conn);
 }
 
-static struct io_plan start_waker(struct io_conn *conn, struct data *d)
+static void finish_waker(struct io_conn *conn, struct data *d)
 {
+       io_wake(d);
        ok1(d->state == 1);
        d->state++;
-
-       io_wake(idler, plan_read, d);
-       return io_close(conn, NULL);
 }
 
-static void finish_waker(struct io_conn *conn, struct data *d)
+static void finish_idle(struct io_conn *conn, struct data *d)
 {
-       ok1(d->state == 2 || d->state == 3);
+       ok1(d->state == 3);
        d->state++;
+       io_break(d);
 }
 
-static struct io_plan start_idle(struct io_conn *conn, struct data *d)
+static struct io_plan *never(struct io_conn *conn, void *arg)
 {
-       int fd;
-
-       ok1(d->state == 0);
-       d->state++;
-       idler = conn;
-
-       /* This will wake us up. */
-       fd = open("/dev/null", O_RDONLY);
-       ok1(fd >= 0);
-       ok1(io_new_conn(fd, start_waker, finish_waker, d));
+       abort();
+}
 
-       return io_idle();
+static struct io_plan *read_buf(struct io_conn *conn, struct data *d)
+{
+       return io_read(conn, d->buf, sizeof(d->buf), read_done, d);
 }
 
-static void finish_idle(struct io_conn *conn, struct data *d)
+static struct io_plan *init_waker(struct io_conn *conn, void *unused)
 {
-       ok1(d->state == 4);
-       d->state++;
-       io_break(d, NULL, NULL);
+       /* This is /dev/null, so will never succeed. */
+       return io_read(conn, unused, 1, never, NULL);
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_idle(struct io_conn *conn, struct data *d)
 {
-       if (!io_new_conn(fd, start_idle, finish_idle, d))
-               abort();
+       int fd2;
+
+       ok1(d->state == 0);
+       d->state++;
+       idler = conn;
+       io_set_finish(conn, finish_idle, d);
+
+       /* This will wake us up, as read will fail. */
+       fd2 = open("/dev/null", O_RDONLY);
+       ok1(fd2 >= 0);
+       io_set_finish(io_new_conn(NULL, fd2, init_waker, d), finish_waker, d);
+
+       return io_wait(conn, d, read_buf, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -107,11 +114,11 @@ int main(void)
        int fd, status;
 
        /* This is how many tests you plan to run */
-       plan_tests(15);
+       plan_tests(13);
        d->state = 0;
-       fd = make_listen_fd("65006", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, init_conn, d);
+       l = io_new_listener(NULL, fd, init_idle, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {
@@ -137,7 +144,7 @@ int main(void)
        freeaddrinfo(addrinfo);
 
        ok1(io_loop() == d);
-       ok1(d->state == 5);
+       ok1(d->state == 4);
        ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
        free(d);
        io_close_listener(l);