X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-17-homemade-io.c;h=d104f3e9a01c18f730da677d847f88172f6628cf;hb=0ce52c7ca42c2b3a6458cac348f5a8b96d7f1b62;hp=a868b2132783401941e54bdf3734b9e3c923bd60;hpb=cdffdf5d61f8330cfc3467e73a84876eb3928e9b;p=ccan

diff --git a/ccan/io/test/run-17-homemade-io.c b/ccan/io/test/run-17-homemade-io.c
index a868b213..d104f3e9 100644
--- a/ccan/io/test/run-17-homemade-io.c
+++ b/ccan/io/test/run-17-homemade-io.c
@@ -6,7 +6,9 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-#ifndef PORT
+#ifdef DEBUG_CONN
+#define PORT "64017"
+#else
 #define PORT "65017"
 #endif
 
@@ -23,19 +25,19 @@ static void finish_ok(struct io_conn *conn, struct packet *pkt)
 	io_break(pkt);
 }
 
-static int do_read_packet(int fd, struct io_plan *plan)
+static int do_read_packet(int fd, struct io_plan_arg *arg)
 {
-	struct packet *pkt = plan->u1.vp;
+	struct packet *pkt = arg->u1.vp;
 	char *dest;
 	ssize_t ret;
 	size_t off, totlen;
 
 	/* Reading len? */
-	if (plan->u2.s < sizeof(size_t)) {
+	if (arg->u2.s < sizeof(size_t)) {
 		ok1(pkt->state == 1);
 		pkt->state++;
 		dest = (char *)&pkt->len;
-		off = plan->u2.s;
+		off = arg->u2.s;
 		totlen = sizeof(pkt->len);
 	} else {
 		ok1(pkt->state == 2);
@@ -46,7 +48,7 @@ static int do_read_packet(int fd, struct io_plan *plan)
 			goto fail;
 		else {
 			dest = pkt->contents;
-			off = plan->u2.s - sizeof(pkt->len);
+			off = arg->u2.s - sizeof(pkt->len);
 			totlen = pkt->len;
 		}
 	}
@@ -55,11 +57,11 @@ static int do_read_packet(int fd, struct io_plan *plan)
 	if (ret <= 0)
 		goto fail;
 
-	plan->u2.s += ret;
+	arg->u2.s += ret;
 
 	/* Finished? */
-	return plan->u2.s >= sizeof(pkt->len)
-		&& plan->u2.s == pkt->len + sizeof(pkt->len);
+	return arg->u2.s >= sizeof(pkt->len)
+		&& arg->u2.s == pkt->len + sizeof(pkt->len);
 
 fail:
 	free(pkt->contents);
@@ -68,24 +70,24 @@ fail:
 
 static struct io_plan *io_read_packet(struct io_conn *conn,
 				      struct packet *pkt,
-				      struct io_plan *(*cb)(struct io_conn *, void *),
-				      void *arg)
+				      struct io_plan *(*cb)(struct io_conn *,
+							    void *),
+				      void *cb_arg)
 {
-	struct io_plan *plan = io_get_plan(conn, IO_IN);
+	struct io_plan_arg *arg = io_plan_arg(conn, IO_IN);
 
-	assert(cb);
 	pkt->contents = NULL;
-	plan->u1.vp = pkt;
-	plan->u2.s = 0;
-	plan->io = do_read_packet;
-	plan->next = cb;
-	plan->next_arg = arg;
+	arg->u1.vp = pkt;
+	arg->u2.s = 0;
 
-	return plan;
+	return io_set_plan(conn, IO_IN, do_read_packet, cb, cb_arg);
 }
 
 static struct io_plan *init_conn(struct io_conn *conn, struct packet *pkt)
 {
+#ifdef DEBUG_CONN
+	io_set_debug(conn, true);
+#endif
 	ok1(pkt->state == 0);
 	pkt->state++;
 
@@ -166,7 +168,7 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == pkt);
+	ok1(io_loop(NULL, NULL) == pkt);
 	ok1(pkt->state == 4);
 	ok1(pkt->len == 8);
 	ok1(memcmp(pkt->contents, "hithere!", 8) == 0);