io: change io_idle() to io_wait()

[ccan] / ccan / io / poll.c

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index d7b9eb56b950b5a1b4772525c86bb944b3a60c6f..8ba376a549aa47ee4be29af3345c034dfdfbf481 100644 (file)
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -167,6 +167,34 @@ void backend_plan_changed(struct io_conn *conn)
                some_always = true;
 }
 
+void backend_wait_changed(const void *wait)
+{
+       unsigned int i;
+
+       for (i = 0; i < num_fds; i++) {
+               struct io_conn *c, *duplex;
+
+               /* Ignore listeners */
+               if (fds[i]->listener)
+                       continue;
+               c = (void *)fds[i];
+               for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
+                       /* Ignore closing. */
+                       if (!c->plan.next)
+                               continue;
+                       /* Not idle? */
+                       if (c->plan.io)
+                               continue;
+                       /* Waiting on something else? */
+                       if (c->plan.u1.const_vp != wait)
+                               continue;
+                       /* Make it do the next thing. */
+                       c->plan = io_always_(c->plan.next, c->plan.next_arg);
+                       backend_plan_changed(c);
+               }
+       }
+}
+
 bool add_conn(struct io_conn *c)
 {
        if (!add_fd(&c->fd, c->plan.pollflag & (POLLIN|POLLOUT)))
@@ -188,11 +216,6 @@ bool add_duplex(struct io_conn *c)
 
 void backend_del_conn(struct io_conn *conn)
 {
-       if (conn->finish) {
-               /* Saved by io_close */
-               errno = conn->plan.u1.s;
-               conn->finish(conn, conn->finish_arg);
-       }
        if (timeout_active(conn))
                backend_del_timeout(conn);
        io_alloc.free(conn->timeout);
@@ -205,6 +228,11 @@ void backend_del_conn(struct io_conn *conn)
        } else
                del_fd(&conn->fd);
        num_closing--;
+       if (conn->finish) {
+               /* Saved by io_close */
+               errno = conn->plan.u1.s;
+               conn->finish(conn, conn->finish_arg);
+       }
        free_conn(conn);
 }