ccan/io: keep always pointers to plans, not a linked list.

[ccan] / ccan / io / io.c

diff --git a/ccan/io/io.c b/ccan/io/io.c
index c5c9bee0daf0329f433eec930058bfd20905f96c..7ebd5a202d7899f356ed1963eb3c6f463ee986e2 100644 (file)
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -97,7 +97,6 @@ struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
        conn->fd.fd = fd;
        conn->finish = NULL;
        conn->finish_arg = NULL;
-       list_node_init(&conn->always);
 
        if (!add_conn(conn))
                return tal_free(conn);
@@ -145,7 +144,9 @@ static struct io_plan *set_always(struct io_conn *conn,
        struct io_plan *plan = &conn->plan[dir];
 
        plan->status = IO_ALWAYS;
-       backend_new_always(conn);
+       /* Only happens on OOM, and only with non-default tal_backend. */
+       if (!backend_new_always(plan))
+               return NULL;
        return io_set_plan(conn, dir, NULL, next, arg);
 }
 
@@ -414,27 +415,14 @@ void io_ready(struct io_conn *conn, int pollflags)
                        || conn->plan[IO_IN].status == IO_POLLING_STARTED);
 }
 
-void io_do_always(struct io_conn *conn)
+void io_do_always(struct io_plan *plan)
 {
-       /* 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);
+       struct io_conn *conn;
 
-       if (conn->plan[IO_IN].status == IO_ALWAYS)
-               if (!next_plan(conn, &conn->plan[IO_IN]))
-                       return;
+       assert(plan->status == IO_ALWAYS);
+       conn = container_of(plan, struct io_conn, plan[plan->dir]);
 
-       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]);
-       }
+       next_plan(conn, plan);
 }
 
 void io_do_wakeup(struct io_conn *conn, enum io_direction dir)