io: don't close if already closing in io_close_other.

[ccan] / ccan / io / io.c

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 734cb3939636acbf0922362915c5c804bcc2cb97..4c73b62455693f6ae5c633c910921583cd3a5089 100644 (file)
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -24,8 +24,6 @@ bool io_plan_nodebug;
 struct io_conn *current;
 /* User-defined function to select which connection(s) to debug. */
 bool (*io_debug_conn)(struct io_conn *conn);
-/* Set when we wake up an connection we are debugging. */
-bool io_debug_wakeup;
 
 struct io_plan io_debug(struct io_plan plan)
 {
@@ -36,12 +34,9 @@ struct io_plan io_debug(struct io_plan plan)
                return plan;
        }
 
-       if (!current || !doing_debug_on(current)) {
-               if (!io_debug_wakeup)
-                       return plan;
-       }
+       if (!current || !doing_debug_on(current))
+               return plan;
 
-       io_debug_wakeup = false;
        current->plan = plan;
        backend_plan_changed(current);
 
@@ -68,7 +63,7 @@ struct io_plan io_debug(struct io_plan plan)
 
        /* Return a do-nothing plan, so backend_plan_changed in
         * io_ready doesn't do anything (it's already been called). */
-       return io_idle_();
+       return io_wait_(NULL, (void *)1, NULL);
 }
 
 int io_debug_io(int ret)
@@ -107,22 +102,12 @@ int io_debug_io(int ret)
        return 2;
 }
 
-static void debug_io_wake(struct io_conn *conn)
-{
-       /* We want linear if we wake a debugged connection, too. */
-       if (io_debug_conn && io_debug_conn(conn))
-               io_debug_wakeup = true;
-}
-
 /* 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 debug_io_wake(struct io_conn *conn)
-{
-}
 static void io_plan_debug_again(void)
 {
 }
@@ -436,37 +421,26 @@ struct io_plan io_connect_(int fd, const struct addrinfo *addr,
        return plan;
 }
 
-struct io_plan io_idle_(void)
+struct io_plan io_wait_(const void *wait,
+                       struct io_plan (*cb)(struct io_conn *, void*),
+                       void *arg)
 {
        struct io_plan plan;
 
+       assert(cb);
        plan.pollflag = 0;
        plan.io = NULL;
-       /* Never called (overridden by io_wake), but NULL means closing */
-       plan.next = (void *)io_idle_;
+       plan.next = cb;
+       plan.next_arg = arg;
 
-       return plan;
-}
+       plan.u1.const_vp = wait;
 
-bool io_is_idle(const struct io_conn *conn)
-{
-       return conn->plan.io == NULL;
+       return plan;
 }
 
-void io_wake_(struct io_conn *conn, struct io_plan plan)
-
+void io_wake(const void *wait)
 {
-       io_plan_debug_again();
-
-       /* It might be closing, but we haven't called its finish() yet. */
-       if (!conn->plan.next)
-               return;
-       /* It was idle, right? */
-       assert(!conn->plan.io);
-       conn->plan = plan;
-       backend_plan_changed(conn);
-
-       debug_io_wake(conn);
+       backend_wait_changed(wait);
 }
 
 void io_ready(struct io_conn *conn)
@@ -516,8 +490,11 @@ struct io_plan io_close_cb(struct io_conn *conn, void *arg)
 
 void io_close_other(struct io_conn *conn)
 {
-       conn->plan = io_close_();
-       backend_plan_changed(conn);
+       /* Don't close if already closing! */
+       if (conn->plan.next) {
+               conn->plan = io_close_();
+               backend_plan_changed(conn);
+       }
 }
 
 /* Exit the loop, returning this (non-NULL) arg. */
@@ -531,6 +508,16 @@ struct io_plan io_break_(void *ret, struct io_plan plan)
        return plan;
 }
 
+static struct io_plan io_never_called(struct io_conn *conn, void *arg)
+{
+       abort();
+}
+
+struct io_plan io_never(void)
+{
+       return io_always_(io_never_called, NULL);
+}
+
 int io_conn_fd(const struct io_conn *conn)
 {
        return conn->fd.fd;