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

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index acf372f5..57d5e20c 100644
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -9,6 +9,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifdef DEBUG_CONN
+#define PORT "64006"
+#else
+#define PORT "65006"
+#endif
+
 static struct io_conn *idler;
 
 struct data {
@@ -16,49 +22,58 @@ struct data {
 	char buf[4];
 };
 
-static struct io_plan *do_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(conn, 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, do_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;
+	abort();
+}
 
-	/* This will wake us up. */
-	fd = open("/dev/null", O_RDONLY);
-	ok1(fd >= 0);
-	ok1(io_new_conn(fd, start_waker, finish_waker, 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);
+}
 
-	return io_idle(conn);
+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 void finish_idle(struct io_conn *conn, struct data *d)
+static struct io_plan *init_idle(struct io_conn *conn, struct data *d)
 {
-	ok1(d->state == 4);
+	int fd2;
+
+	ok1(d->state == 0);
 	d->state++;
-	io_break(conn, d, NULL, NULL);
+	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)
@@ -101,11 +116,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, start_idle, finish_idle, d);
+	l = io_new_listener(NULL, fd, init_idle, d);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {
@@ -130,8 +145,8 @@ int main(void)
 	}
 	freeaddrinfo(addrinfo);
 
-	ok1(io_loop() == d);
-	ok1(d->state == 5);
+	ok1(io_loop(NULL, NULL) == d);
+	ok1(d->state == 4);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);
 	io_close_listener(l);