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

diff --git a/ccan/io/test/run-06-idle.c b/ccan/io/test/run-06-idle.c
index 314293a5..fb681a08 100644
--- a/ccan/io/test/run-06-idle.c
+++ b/ccan/io/test/run-06-idle.c
@@ -16,55 +16,39 @@ 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, NULL);
 }
 
-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(idler, io_read(d->buf, sizeof(d->buf), read_done, 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, io_idle());
 }
 
-static struct io_plan start_idle(struct io_conn *conn, struct data *d)
+static void init_conn(int fd, struct data *d)
 {
-	int fd;
+	int fd2;
 
 	ok1(d->state == 0);
 	d->state++;
-	idler = conn;
+	idler = io_new_conn(fd, io_idle(), finish_idle, d);
 
-	/* This will wake us up. */
-	fd = open("/dev/null", O_RDONLY);
-	ok1(fd >= 0);
-	ok1(io_new_conn(fd, start_waker, finish_waker, d));
-
-	return io_idle();
-}
-
-static void finish_idle(struct io_conn *conn, struct data *d)
-{
-	ok1(d->state == 4);
-	d->state++;
-	io_break(d, NULL, NULL);
-}
-
-static void init_conn(int fd, struct data *d)
-{
-	if (!io_new_conn(fd, start_idle, finish_idle, d))
-		abort();
+	/* 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));
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -107,7 +91,7 @@ int main(void)
 	int fd, status;
 
 	/* This is how many tests you plan to run */
-	plan_tests(15);
+	plan_tests(14);
 	d->state = 0;
 	fd = make_listen_fd("65006", &addrinfo);
 	ok1(fd >= 0);
@@ -137,7 +121,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);