io: update for new timer API.

[ccan] / ccan / io / test / run-07-break.c

diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c
index 6fcaea341b58f1123ab72a322d3260dd71f53ba2..d13b0f183609bc8cef34d1992eae0f068358c5be 100644 (file)
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -6,7 +6,9 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-#ifndef PORT
+#ifdef DEBUG_CONN
+#define PORT "64007"
+#else
 #define PORT "65007"
 #endif
 
@@ -15,11 +17,11 @@ struct data {
        char buf[4];
 };
 
-static struct io_plan read_done(struct io_conn *conn, struct data *d)
+static struct io_plan *read_done(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
-       return io_close(conn, NULL);
+       return io_close(conn);
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -28,15 +30,18 @@ static void finish_ok(struct io_conn *conn, struct data *d)
        d->state++;
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
+#ifdef DEBUG_CONN
+       io_set_debug(conn, true);
+#endif
        ok1(d->state == 0);
        d->state++;
 
-       io_set_finish(io_new_conn(fd,
-                                 io_break(d,
-                                          io_read(d->buf, sizeof(d->buf), read_done, d))),
-                     finish_ok, d);
+       io_set_finish(conn, finish_ok, d);
+
+       io_break(d);
+       return io_read(conn, d->buf, sizeof(d->buf), read_done, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -83,7 +88,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, init_conn, d);
+       l = io_new_listener(NULL, fd, init_conn, d);
        ok1(l);
        fflush(stdout);
        if (!fork()) {
@@ -107,11 +112,11 @@ int main(void)
                exit(0);
        }
        freeaddrinfo(addrinfo);
-       ok1(io_loop() == d);
+       ok1(io_loop(NULL, NULL) == d);
        ok1(d->state == 1);
        io_close_listener(l);
 
-       ok1(io_loop() == NULL);
+       ok1(io_loop(NULL, NULL) == NULL);
        ok1(d->state == 3);
        ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
        free(d);