X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=cc2b1afa3b27720adff4e3aa0b0c1d4fd4a393a3;hp=8e2695292bb158a15130c0754dbbee94ac2bfb71;hb=3ffb94e9aad84dc0d8e19a5a7d709589d7956ddf;hpb=12e924346b342c61219a3fdc57eb6b00a27f1cd1

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 8e269529..cc2b1afa 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -10,156 +10,112 @@
 #include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <ccan/container_of/container_of.h>
 
 void *io_loop_return;
 
-struct io_alloc io_alloc = {
-	malloc, realloc, free
-};
+struct io_plan io_conn_freed;
 
-#ifdef DEBUG
-/* Set to skip the next plan. */
-bool io_plan_nodebug;
-/* The current connection to apply plan to. */
-struct io_conn *current;
-/* User-defined function to select which connection(s) to debug. */
-bool (*io_debug_conn)(struct io_conn *conn);
-
-struct io_plan io_debug(struct io_plan plan)
+struct io_listener *io_new_listener_(const tal_t *ctx, int fd,
+				     struct io_plan *(*init)(struct io_conn *,
+							     void *),
+				     void *arg)
 {
-	struct io_conn *ready = NULL;
+	struct io_listener *l = tal(ctx, struct io_listener);
+	if (!l)
+		return NULL;
 
-	if (io_plan_nodebug) {
-		io_plan_nodebug = false;
-		return plan;
-	}
+	l->fd.listener = true;
+	l->fd.fd = fd;
+	l->init = init;
+	l->arg = arg;
+	l->ctx = ctx;
+	if (!add_listener(l))
+		return tal_free(l);
+	return l;
+}
 
-	if (!current || !doing_debug_on(current))
-		return plan;
-
-	current->plan = plan;
-	backend_plan_changed(current);
-
-	/* Call back into the loop immediately. */
-	io_loop_return = do_io_loop(&ready);
-
-	if (ready) {
-		set_current(ready);
-		if (!ready->plan.next) {
-			/* Call finish function immediately. */
-			if (ready->finish) {
-				errno = ready->plan.u1.s;
-				ready->finish(ready, ready->finish_arg);
-				ready->finish = NULL;
-			}
-			backend_del_conn(ready);
-		} else {
-			/* Calls back in itself, via io_debug_io(). */
-			if (ready->plan.io(ready->fd.fd, &ready->plan) != 2)
-				abort();
-		}
-		set_current(NULL);
-	}
+void io_close_listener(struct io_listener *l)
+{
+	tal_free(l);
+}
 
-	/* Return a do-nothing plan, so backend_plan_changed in
-	 * io_ready doesn't do anything (it's already been called). */
-	return io_wait_(NULL, (void *)1, NULL);
+static struct io_plan *io_never_called(struct io_conn *conn, void *arg)
+{
+	abort();
 }
 
-int io_debug_io(int ret)
+/* Returns false if conn was freed. */
+static bool next_plan(struct io_conn *conn, struct io_plan *plan)
 {
-	/* Cache it for debugging; current changes. */
-	struct io_conn *conn = current;
-	int saved_errno = errno;
+	struct io_plan *(*next)(struct io_conn *, void *arg);
 
-	if (!doing_debug_on(conn))
-		return ret;
+	next = plan->next;
 
-	/* These will all go linearly through the io_debug() path above. */
-	switch (ret) {
-	case -1:
-		/* This will call io_debug above. */
-		errno = saved_errno;
-		io_close();
-		break;
-	case 0: /* Keep going with plan. */
-		io_debug(conn->plan);
-		break;
-	case 1: /* Done: get next plan. */
-		if (timeout_active(conn))
-			backend_del_timeout(conn);
-		/* In case they call io_duplex, clear our poll flags so
-		 * both sides don't seem to be both doing read or write
-		 * (See	assert(!mask || pfd->events != mask) in poll.c) */
-		conn->plan.pollflag = 0;
-		conn->plan.next(conn, conn->plan.next_arg);
-		break;
-	default:
-		abort();
-	}
+	plan->status = IO_UNSET;
+	plan->io = NULL;
+	plan->next = io_never_called;
 
-	/* Normally-invalid value, used for sanity check. */
-	return 2;
-}
+	plan = next(conn, plan->next_arg);
 
-/* Counterpart to io_plan_no_debug(), called in macros in io.h */
-static void io_plan_debug_again(void)
-{
-	io_plan_nodebug = false;
-}
-#else
-static void io_plan_debug_again(void)
-{
+	if (plan == &io_conn_freed)
+		return false;
+
+	/* It should have set a plan inside this conn (or duplex) */
+	assert(plan == &conn->plan[IO_IN]
+	       || plan == &conn->plan[IO_OUT]
+	       || plan == &conn->plan[2]);
+	assert(conn->plan[IO_IN].status != IO_UNSET
+	       || conn->plan[IO_OUT].status != IO_UNSET);
+
+	backend_new_plan(conn);
+	return true;
 }
-#endif
 
-struct io_listener *io_new_listener_(int fd,
-				     void (*init)(int fd, void *arg),
-				     void *arg)
+bool io_fd_block(int fd, bool block)
 {
-	struct io_listener *l = io_alloc.alloc(sizeof(*l));
+	int flags = fcntl(fd, F_GETFL);
 
-	if (!l)
-		return NULL;
+	if (flags == -1)
+		return false;
 
-	l->fd.listener = true;
-	l->fd.fd = fd;
-	l->init = init;
-	l->arg = arg;
-	if (!add_listener(l)) {
-		io_alloc.free(l);
-		return NULL;
-	}
-	return l;
-}
+	if (block)
+		flags &= ~O_NONBLOCK;
+	else
+		flags |= O_NONBLOCK;
 
-void io_close_listener(struct io_listener *l)
-{
-	close(l->fd.fd);
-	del_listener(l);
-	io_alloc.free(l);
+	return fcntl(fd, F_SETFL, flags) != -1;
 }
 
-struct io_conn *io_new_conn_(int fd, struct io_plan plan)
+struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
+			     struct io_plan *(*init)(struct io_conn *, void *),
+			     void *arg)
 {
-	struct io_conn *conn = io_alloc.alloc(sizeof(*conn));
-
-	io_plan_debug_again();
+	struct io_conn *conn = tal(ctx, struct io_conn);
 
 	if (!conn)
 		return NULL;
 
 	conn->fd.listener = false;
 	conn->fd.fd = fd;
-	conn->plan = plan;
 	conn->finish = NULL;
 	conn->finish_arg = NULL;
-	conn->duplex = NULL;
-	conn->timeout = NULL;
-	if (!add_conn(conn)) {
-		io_alloc.free(conn);
+	list_node_init(&conn->always);
+
+	if (!add_conn(conn))
+		return tal_free(conn);
+
+	/* Keep our I/O async. */
+	io_fd_block(fd, false);
+
+	/* We start with out doing nothing, and in doing our init. */
+	conn->plan[IO_OUT].status = IO_UNSET;
+
+	conn->plan[IO_IN].next = init;
+	conn->plan[IO_IN].next_arg = arg;
+	if (!next_plan(conn, &conn->plan[IO_IN]))
 		return NULL;
-	}
+
 	return conn;
 }
 
@@ -171,209 +127,167 @@ void io_set_finish_(struct io_conn *conn,
 	conn->finish_arg = arg;
 }
 
-struct io_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
+struct io_plan_arg *io_plan_arg(struct io_conn *conn, enum io_direction dir)
 {
-	struct io_conn *conn;
-
-	io_plan_debug_again();
-
-	assert(!old->duplex);
-
-	conn = io_alloc.alloc(sizeof(*conn));
-	if (!conn)
-		return NULL;
+	assert(conn->plan[dir].status == IO_UNSET);
 
-	conn->fd.listener = false;
-	conn->fd.fd = old->fd.fd;
-	conn->plan = plan;
-	conn->duplex = old;
-	conn->finish = NULL;
-	conn->finish_arg = NULL;
-	conn->timeout = NULL;
-	if (!add_duplex(conn)) {
-		io_alloc.free(conn);
-		return NULL;
-	}
-	old->duplex = conn;
-	return conn;
+	conn->plan[dir].status = IO_POLLING;
+	return &conn->plan[dir].arg;
 }
 
-bool io_timeout_(struct io_conn *conn, struct timerel t,
-		 struct io_plan (*cb)(struct io_conn *, void *), void *arg)
+static struct io_plan *set_always(struct io_conn *conn,
+				  enum io_direction dir,
+				  struct io_plan *(*next)(struct io_conn *,
+							  void *),
+				  void *arg)
 {
-	assert(cb);
-
-	if (!conn->timeout) {
-		conn->timeout = io_alloc.alloc(sizeof(*conn->timeout));
-		if (!conn->timeout)
-			return false;
-	} else
-		assert(!timeout_active(conn));
+	struct io_plan *plan = &conn->plan[dir];
 
-	conn->timeout->next = cb;
-	conn->timeout->next_arg = arg;
-	backend_add_timeout(conn, t);
-	return true;
+	plan->status = IO_ALWAYS;
+	backend_new_always(conn);
+	return io_set_plan(conn, dir, NULL, next, arg);
 }
 
-/* Always done: call the next thing. */
-static int do_always(int fd, struct io_plan *plan)
+static struct io_plan *io_always_dir(struct io_conn *conn,
+				     enum io_direction dir,
+				     struct io_plan *(*next)(struct io_conn *,
+							     void *),
+				     void *arg)
 {
-	return 1;
+	return set_always(conn, dir, next, arg);
 }
 
-struct io_plan io_always_(struct io_plan (*cb)(struct io_conn *, void *),
-			  void *arg)
+struct io_plan *io_always_(struct io_conn *conn,
+			   struct io_plan *(*next)(struct io_conn *, void *),
+			   void *arg)
 {
-	struct io_plan plan;
-
-	assert(cb);
-	plan.io = do_always;
-	plan.next = cb;
-	plan.next_arg = arg;
-	plan.pollflag = POLLALWAYS;
+	return io_always_dir(conn, IO_IN, next, arg);
+}
 
-	return plan;
+struct io_plan *io_out_always_(struct io_conn *conn,
+			       struct io_plan *(*next)(struct io_conn *,
+						       void *),
+			       void *arg)
+{
+	return io_always_dir(conn, IO_OUT, next, arg);
 }
 
-/* Returns true if we're finished. */
-static int do_write(int fd, struct io_plan *plan)
+static int do_write(int fd, struct io_plan_arg *arg)
 {
-	ssize_t ret = write(fd, plan->u1.cp, plan->u2.s);
+	ssize_t ret = write(fd, arg->u1.cp, arg->u2.s);
 	if (ret < 0)
-		return io_debug_io(-1);
+		return -1;
 
-	plan->u1.cp += ret;
-	plan->u2.s -= ret;
-	return io_debug_io(plan->u2.s == 0);
+	arg->u1.cp += ret;
+	arg->u2.s -= ret;
+	return arg->u2.s == 0;
 }
 
 /* Queue some data to be written. */
-struct io_plan io_write_(const void *data, size_t len,
-			 struct io_plan (*cb)(struct io_conn *, void *),
-			 void *arg)
+struct io_plan *io_write_(struct io_conn *conn, const void *data, size_t len,
+			  struct io_plan *(*next)(struct io_conn *, void *),
+			  void *next_arg)
 {
-	struct io_plan plan;
-
-	assert(cb);
+	struct io_plan_arg *arg = io_plan_arg(conn, IO_OUT);
 
 	if (len == 0)
-		return io_always_(cb, arg);
+		return set_always(conn, IO_OUT, next, next_arg);
 
-	plan.u1.const_vp = data;
-	plan.u2.s = len;
-	plan.io = do_write;
-	plan.next = cb;
-	plan.next_arg = arg;
-	plan.pollflag = POLLOUT;
+	arg->u1.const_vp = data;
+	arg->u2.s = len;
 
-	return plan;
+	return io_set_plan(conn, IO_OUT, do_write, next, next_arg);
 }
 
-static int do_read(int fd, struct io_plan *plan)
+static int do_read(int fd, struct io_plan_arg *arg)
 {
-	ssize_t ret = read(fd, plan->u1.cp, plan->u2.s);
+	ssize_t ret = read(fd, arg->u1.cp, arg->u2.s);
 	if (ret <= 0)
-		return io_debug_io(-1);
+		return -1;
 
-	plan->u1.cp += ret;
-	plan->u2.s -= ret;
-	return io_debug_io(plan->u2.s == 0);
+	arg->u1.cp += ret;
+	arg->u2.s -= ret;
+	return arg->u2.s == 0;
 }
 
 /* Queue a request to read into a buffer. */
-struct io_plan io_read_(void *data, size_t len,
-			struct io_plan (*cb)(struct io_conn *, void *),
-			void *arg)
+struct io_plan *io_read_(struct io_conn *conn,
+			 void *data, size_t len,
+			 struct io_plan *(*next)(struct io_conn *, void *),
+			 void *next_arg)
 {
-	struct io_plan plan;
-
-	assert(cb);
+	struct io_plan_arg *arg = io_plan_arg(conn, IO_IN);
 
 	if (len == 0)
-		return io_always_(cb, arg);
-
-	plan.u1.cp = data;
-	plan.u2.s = len;
-	plan.io = do_read;
-	plan.next = cb;
-	plan.next_arg = arg;
+		return set_always(conn, IO_IN, next, next_arg);
 
-	plan.pollflag = POLLIN;
+	arg->u1.cp = data;
+	arg->u2.s = len;
 
-	return plan;
+	return io_set_plan(conn, IO_IN, do_read, next, next_arg);
 }
 
-static int do_read_partial(int fd, struct io_plan *plan)
+static int do_read_partial(int fd, struct io_plan_arg *arg)
 {
-	ssize_t ret = read(fd, plan->u1.cp, *(size_t *)plan->u2.vp);
+	ssize_t ret = read(fd, arg->u1.cp, *(size_t *)arg->u2.vp);
 	if (ret <= 0)
-		return io_debug_io(-1);
+		return -1;
 
-	*(size_t *)plan->u2.vp = ret;
-	return io_debug_io(1);
+	*(size_t *)arg->u2.vp = ret;
+	return 1;
 }
 
 /* Queue a partial request to read into a buffer. */
-struct io_plan io_read_partial_(void *data, size_t *len,
-				struct io_plan (*cb)(struct io_conn *, void *),
-				void *arg)
+struct io_plan *io_read_partial_(struct io_conn *conn,
+				 void *data, size_t maxlen, size_t *len,
+				 struct io_plan *(*next)(struct io_conn *,
+							 void *),
+				 void *next_arg)
 {
-	struct io_plan plan;
-
-	assert(cb);
+	struct io_plan_arg *arg = io_plan_arg(conn, IO_IN);
 
-	if (*len == 0)
-		return io_always_(cb, arg);
+	if (maxlen == 0)
+		return set_always(conn, IO_IN, next, next_arg);
 
-	plan.u1.cp = data;
-	plan.u2.vp = len;
-	plan.io = do_read_partial;
-	plan.next = cb;
-	plan.next_arg = arg;
-	plan.pollflag = POLLIN;
+	arg->u1.cp = data;
+	/* We store the max len in here temporarily. */
+	*len = maxlen;
+	arg->u2.vp = len;
 
-	return plan;
+	return io_set_plan(conn, IO_IN, do_read_partial, next, next_arg);
 }
 
-static int do_write_partial(int fd, struct io_plan *plan)
+static int do_write_partial(int fd, struct io_plan_arg *arg)
 {
-	ssize_t ret = write(fd, plan->u1.cp, *(size_t *)plan->u2.vp);
+	ssize_t ret = write(fd, arg->u1.cp, *(size_t *)arg->u2.vp);
 	if (ret < 0)
-		return io_debug_io(-1);
+		return -1;
 
-	*(size_t *)plan->u2.vp = ret;
-	return io_debug_io(1);
+	*(size_t *)arg->u2.vp = ret;
+	return 1;
 }
 
 /* Queue a partial write request. */
-struct io_plan io_write_partial_(const void *data, size_t *len,
-				 struct io_plan (*cb)(struct io_conn*, void *),
-				 void *arg)
+struct io_plan *io_write_partial_(struct io_conn *conn,
+				  const void *data, size_t maxlen, size_t *len,
+				  struct io_plan *(*next)(struct io_conn *,
+							  void*),
+				  void *next_arg)
 {
-	struct io_plan plan;
+	struct io_plan_arg *arg = io_plan_arg(conn, IO_OUT);
 
-	assert(cb);
+	if (maxlen == 0)
+		return set_always(conn, IO_OUT, next, next_arg);
 
-	if (*len == 0)
-		return io_always_(cb, arg);
+	arg->u1.const_vp = data;
+	/* We store the max len in here temporarily. */
+	*len = maxlen;
+	arg->u2.vp = len;
 
-	plan.u1.const_vp = data;
-	plan.u2.vp = len;
-	plan.io = do_write_partial;
-	plan.next = cb;
-	plan.next_arg = arg;
-	plan.pollflag = POLLOUT;
-
-	return plan;
-}
-
-static int already_connected(int fd, struct io_plan *plan)
-{
-	return io_debug_io(1);
+	return io_set_plan(conn, IO_OUT, do_write_partial, next, next_arg);
 }
 
-static int do_connect(int fd, struct io_plan *plan)
+static int do_connect(int fd, struct io_plan_arg *arg)
 {
 	int err, ret;
 	socklen_t len = sizeof(err);
@@ -384,8 +298,6 @@ static int do_connect(int fd, struct io_plan *plan)
 		return -1;
 
 	if (err == 0) {
-		/* Restore blocking if it was initially. */
-		fcntl(fd, F_SETFL, plan->u1.s);
 		return 1;
 	} else if (err == EINPROGRESS)
 		return 0;
@@ -394,131 +306,155 @@ static int do_connect(int fd, struct io_plan *plan)
 	return -1;
 }
 
-struct io_plan io_connect_(int fd, const struct addrinfo *addr,
-			   struct io_plan (*cb)(struct io_conn*, void *),
-			   void *arg)
+struct io_plan *io_connect_(struct io_conn *conn, const struct addrinfo *addr,
+			    struct io_plan *(*next)(struct io_conn *, void *),
+			    void *next_arg)
 {
-	struct io_plan plan;
-
-	assert(cb);
+	int fd = io_conn_fd(conn);
 
-	plan.next = cb;
-	plan.next_arg = arg;
+	/* We don't actually need the arg, but we need it polling. */
+	io_plan_arg(conn, IO_OUT);
 
-	/* Save old flags, set nonblock if not already. */
-	plan.u1.s = fcntl(fd, F_GETFL);
-	fcntl(fd, F_SETFL, plan.u1.s | O_NONBLOCK);
+	/* Note that io_new_conn() will make fd O_NONBLOCK */
 
 	/* Immediate connect can happen. */
-	if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0) {
-		/* Dummy will be called immediately. */
-		plan.pollflag = POLLOUT;
-		plan.io = already_connected;
-	} else {
-		if (errno != EINPROGRESS)
-			return io_close_();
-
-		plan.pollflag = POLLIN;
-		plan.io = do_connect;
-	}
-	return plan;
+	if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0)
+		return set_always(conn, IO_OUT, next, next_arg);
+
+	if (errno != EINPROGRESS)
+		return io_close(conn);
+
+	return io_set_plan(conn, IO_OUT, do_connect, next, next_arg);
 }
 
-struct io_plan io_wait_(const void *wait,
-			struct io_plan (*cb)(struct io_conn *, void*),
-			void *arg)
+static struct io_plan *io_wait_dir(struct io_conn *conn,
+				   const void *wait,
+				   enum io_direction dir,
+				   struct io_plan *(*next)(struct io_conn *,
+							   void *),
+				   void *next_arg)
 {
-	struct io_plan plan;
+	struct io_plan_arg *arg = io_plan_arg(conn, dir);
+	arg->u1.const_vp = wait;
 
-	assert(cb);
-	plan.pollflag = 0;
-	plan.io = NULL;
-	plan.next = cb;
-	plan.next_arg = arg;
+	conn->plan[dir].status = IO_WAITING;
 
-	plan.u1.const_vp = wait;
+	return io_set_plan(conn, dir, NULL, next, next_arg);
+}
 
-	return plan;
+struct io_plan *io_wait_(struct io_conn *conn,
+			 const void *wait,
+			 struct io_plan *(*next)(struct io_conn *, void *),
+			 void *next_arg)
+{
+	return io_wait_dir(conn, wait, IO_IN, next, next_arg);
+}
+
+struct io_plan *io_out_wait_(struct io_conn *conn,
+			     const void *wait,
+			     struct io_plan *(*next)(struct io_conn *, void *),
+			     void *next_arg)
+{
+	return io_wait_dir(conn, wait, IO_OUT, next, next_arg);
 }
 
 void io_wake(const void *wait)
 {
-	backend_wait_changed(wait);
+	backend_wake(wait);
 }
 
-void io_ready(struct io_conn *conn)
+/* Returns false if this has been freed. */
+static bool do_plan(struct io_conn *conn, struct io_plan *plan)
 {
-	/* Beware io_close_other! */
-	if (!conn->plan.next)
-		return;
+	/* We shouldn't have polled for this event if this wasn't true! */
+	assert(plan->status == IO_POLLING);
 
-	set_current(conn);
-	switch (conn->plan.io(conn->fd.fd, &conn->plan)) {
-	case -1: /* Failure means a new plan: close up. */
-		conn->plan = io_close();
-		backend_plan_changed(conn);
-		break;
-	case 0: /* Keep going with plan. */
-		break;
-	case 1: /* Done: get next plan. */
-		if (timeout_active(conn))
-			backend_del_timeout(conn);
-		/* In case they call io_duplex, clear our poll flags so
-		 * both sides don't seem to be both doing read or write
-		 * (See	assert(!mask || pfd->events != mask) in poll.c) */
-		conn->plan.pollflag = 0;
-		conn->plan = conn->plan.next(conn, conn->plan.next_arg);
-		backend_plan_changed(conn);
+	switch (plan->io(conn->fd.fd, &plan->arg)) {
+	case -1:
+		io_close(conn);
+		return false;
+	case 0:
+		return true;
+	case 1:
+		return next_plan(conn, plan);
+	default:
+		/* IO should only return -1, 0 or 1 */
+		abort();
 	}
-	set_current(NULL);
 }
 
-/* Close the connection, we're done. */
-struct io_plan io_close_(void)
+void io_ready(struct io_conn *conn, int pollflags)
 {
-	struct io_plan plan;
+	if (pollflags & POLLIN)
+		if (!do_plan(conn, &conn->plan[IO_IN]))
+			return;
 
-	plan.pollflag = 0;
-	/* This means we're closing. */
-	plan.next = NULL;
-	plan.u1.s = errno;
+	if (pollflags & POLLOUT)
+		do_plan(conn, &conn->plan[IO_OUT]);
+}
 
-	return plan;
+void io_do_always(struct io_conn *conn)
+{
+	/* There's a corner case where the in next_plan wakes up the
+	 * out, placing it in IO_ALWAYS and we end up processing it immediately,
+	 * only to leave it in the always list.
+	 *
+	 * Yet we can't just process one, in case they are both supposed
+	 * to be done, so grab state beforehand.
+	 */
+	bool always_out = (conn->plan[IO_OUT].status == IO_ALWAYS);
+
+	if (conn->plan[IO_IN].status == IO_ALWAYS)
+		if (!next_plan(conn, &conn->plan[IO_IN]))
+			return;
+
+	if (always_out) {
+		/* You can't *unalways* a conn (except by freeing, in which
+		 * case next_plan() returned false */
+		assert(conn->plan[IO_OUT].status == IO_ALWAYS);
+		next_plan(conn, &conn->plan[IO_OUT]);
+	}
 }
 
-struct io_plan io_close_cb(struct io_conn *conn, void *arg)
+void io_do_wakeup(struct io_conn *conn, enum io_direction dir)
 {
-	return io_close();
+	struct io_plan *plan = &conn->plan[dir];
+
+	assert(plan->status == IO_WAITING);
+
+	set_always(conn, dir, plan->next, plan->next_arg);
 }
 
-void io_close_other(struct io_conn *conn)
+/* Close the connection, we're done. */
+struct io_plan *io_close(struct io_conn *conn)
 {
-	/* Don't close if already closing! */
-	if (conn->plan.next) {
-		conn->plan = io_close_();
-		backend_plan_changed(conn);
-	}
+	tal_free(conn);
+	return &io_conn_freed;
 }
 
-/* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan io_break_(void *ret, struct io_plan plan)
+struct io_plan *io_close_cb(struct io_conn *conn, void *next_arg)
 {
-	io_plan_debug_again();
+	return io_close(conn);
+}
 
-	assert(ret);
-	io_loop_return = ret;
+struct io_plan *io_close_taken_fd(struct io_conn *conn)
+{
+	io_fd_block(conn->fd.fd, true);
 
-	return plan;
+	cleanup_conn_without_close(conn);
+	return io_close(conn);
 }
 
-static struct io_plan io_never_called(struct io_conn *conn, void *arg)
+/* Exit the loop, returning this (non-NULL) arg. */
+void io_break(const void *ret)
 {
-	abort();
+	assert(ret);
+	io_loop_return = (void *)ret;
 }
 
-struct io_plan io_never(void)
+struct io_plan *io_never(struct io_conn *conn, void *unused)
 {
-	return io_always_(io_never_called, NULL);
+	return io_always(conn, io_never_called, NULL);
 }
 
 int io_conn_fd(const struct io_conn *conn)
@@ -526,11 +462,74 @@ int io_conn_fd(const struct io_conn *conn)
 	return conn->fd.fd;
 }
 
-void io_set_alloc(void *(*allocfn)(size_t size),
-		  void *(*reallocfn)(void *ptr, size_t size),
-		  void (*freefn)(void *ptr))
+struct io_plan *io_duplex(struct io_conn *conn,
+			  struct io_plan *in_plan, struct io_plan *out_plan)
 {
-	io_alloc.alloc = allocfn;
-	io_alloc.realloc = reallocfn;
-	io_alloc.free = freefn;
+	assert(conn == container_of(in_plan, struct io_conn, plan[IO_IN]));
+	/* in_plan must be conn->plan[IO_IN], out_plan must be [IO_OUT] */
+	assert(out_plan == in_plan + 1);
+	return out_plan + 1;
+}
+
+struct io_plan *io_halfclose(struct io_conn *conn)
+{
+	/* Both unset?  OK. */
+	if (conn->plan[IO_IN].status == IO_UNSET
+	    && conn->plan[IO_OUT].status == IO_UNSET)
+		return io_close(conn);
+
+	/* We leave this unset then. */
+	if (conn->plan[IO_IN].status == IO_UNSET)
+		return &conn->plan[IO_IN];
+	else
+		return &conn->plan[IO_OUT];
+}
+
+struct io_plan *io_set_plan(struct io_conn *conn, enum io_direction dir,
+			    int (*io)(int fd, struct io_plan_arg *arg),
+			    struct io_plan *(*next)(struct io_conn *, void *),
+			    void *next_arg)
+{
+	struct io_plan *plan = &conn->plan[dir];
+
+	plan->io = io;
+	plan->next = next;
+	plan->next_arg = next_arg;
+	assert(next != NULL);
+
+	return plan;
+}
+
+bool io_flush_sync(struct io_conn *conn)
+{
+	struct io_plan *plan = &conn->plan[IO_OUT];
+	bool ok;
+
+	/* Not writing?  Nothing to do. */
+	if (plan->status != IO_POLLING)
+		return true;
+
+	/* Synchronous please. */
+	io_fd_block(io_conn_fd(conn), true);
+
+again:
+	switch (plan->io(conn->fd.fd, &plan->arg)) {
+	case -1:
+		ok = false;
+		break;
+	/* Incomplete, try again. */
+	case 0:
+		goto again;
+	case 1:
+		ok = true;
+		/* In case they come back. */
+		set_always(conn, IO_OUT, plan->next, plan->next_arg);
+		break;
+	default:
+		/* IO should only return -1, 0 or 1 */
+		abort();
+	}
+
+	io_fd_block(io_conn_fd(conn), false);
+	return ok;
 }