X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-06-idle.c;h=57d5e20c13ec33223300f409f35953044641abd2;hb=0fbc79090f9ff5bc1caf8c0f0f05525a05f2e82d;hp=b32cbfe225c1e2bd5949509cd9d33558f1ce1712;hpb=0f16a4197c94bfa84dad56d0cb9a9c20438d0a45;p=ccan

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index b32cbfe2..57d5e20c 100644
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -9,7 +9,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifndef PORT
+#ifdef DEBUG_CONN
+#define PORT "64006"
+#else
 #define PORT "65006"
 #endif
 
@@ -20,16 +22,16 @@ 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 == 2 || d->state == 3);
 	d->state++;
-	return io_close(conn, NULL);
+	return io_close(conn);
 }
 
 static void finish_waker(struct io_conn *conn, struct data *d)
 {
-	io_wake(idler, io_read(d->buf, sizeof(d->buf), read_done, d));
+	io_wake(d);
 	ok1(d->state == 1);
 	d->state++;
 }
@@ -38,28 +40,40 @@ static void finish_idle(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 3);
 	d->state++;
-	io_break(d, io_idle());
+	io_break(d);
 }
 
-static struct io_plan never(struct io_conn *conn, void *arg)
+static struct io_plan *never(struct io_conn *conn, void *arg)
 {
 	abort();
 }
 
-static void init_conn(int fd, struct data *d)
+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 struct io_plan *init_waker(struct io_conn *conn, void *unused)
+{
+	/* This is /dev/null, so will never succeed. */
+	return io_read(conn, unused, 1, never, NULL);
+}
+
+static struct io_plan *init_idle(struct io_conn *conn, struct data *d)
 {
 	int fd2;
 
 	ok1(d->state == 0);
 	d->state++;
-	idler = io_new_conn(fd, io_idle());
-	io_set_finish(idler, finish_idle, d);
+	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(fd2, io_read(idler, 1, never, NULL)),
-		      finish_waker, d);
+	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)
@@ -106,7 +120,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_idle, d);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {
@@ -131,7 +145,7 @@ int main(void)
 	}
 	freeaddrinfo(addrinfo);
 
-	ok1(io_loop() == d);
+	ok1(io_loop(NULL, NULL) == d);
 	ok1(d->state == 4);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);