X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-06-idle.c;h=455b8608f1cae1723763154a5bb918d1b5a46a11;hb=1273379185b86aefe5d426d3208289b70044acac;hp=fb681a08fcf60d920141c2044335b6fc01570c26;hpb=57d9d1be33905691ec756b14b066181ca6850ced;p=ccan

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index fb681a08..455b8608 100644
--- 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 {
@@ -20,11 +24,12 @@ 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();
 }
 
 static void finish_waker(struct io_conn *conn, struct data *d)
 {
+	ok1(io_is_idle(idler));
 	io_wake(idler, io_read(d->buf, sizeof(d->buf), read_done, d));
 	ok1(d->state == 1);
 	d->state++;
@@ -37,18 +42,25 @@ static void finish_idle(struct io_conn *conn, struct data *d)
 	io_break(d, io_idle());
 }
 
+static struct io_plan never(struct io_conn *conn, void *arg)
+{
+	abort();
+}
+
 static void init_conn(int fd, struct data *d)
 {
 	int fd2;
 
 	ok1(d->state == 0);
 	d->state++;
-	idler = io_new_conn(fd, io_idle(), finish_idle, d);
+	idler = io_new_conn(fd, io_idle());
+	io_set_finish(idler, finish_idle, d);
 
 	/* This will wake us up, as read will fail. */
 	fd2 = open("/dev/null", O_RDONLY);
 	ok1(fd2 >= 0);
-	ok1(io_new_conn(fd2, io_read(idler, 1, NULL, NULL), finish_waker, d));
+	io_set_finish(io_new_conn(fd2, io_read(idler, 1, never, NULL)),
+		      finish_waker, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -93,7 +105,7 @@ int main(void)
 	/* This is how many tests you plan to run */
 	plan_tests(14);
 	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);
 	ok1(l);