io: remove io_debug support.

[ccan] / ccan / io / io.c

diff --git a/ccan/io/io.c b/ccan/io/io.c
index c0af6bf7e4d66ec761307b49931dcca85f64e3a8..83f933acd994ce58456bd336f9af24f9622e8dd4 100644 (file)
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -67,6 +67,18 @@ static void next_plan(struct io_conn *conn, struct io_plan *plan)
        backend_new_plan(conn);
 }
 
+static void set_blocking(int fd, bool block)
+{
+       int flags = fcntl(fd, F_GETFL);
+
+       if (block)
+               flags &= ~O_NONBLOCK;
+       else
+               flags |= O_NONBLOCK;
+
+       fcntl(fd, F_SETFL, flags);
+}
+
 struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
                             struct io_plan *(*init)(struct io_conn *, void *),
                             void *arg)
@@ -80,12 +92,15 @@ struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
        conn->fd.fd = fd;
        conn->finish = NULL;
        conn->finish_arg = NULL;
-       conn->list = NULL;
-       conn->debug = false;
+       list_node_init(&conn->always);
+       list_node_init(&conn->closing);
 
        if (!add_conn(conn))
                return tal_free(conn);
 
+       /* Keep our I/O async. */
+       set_blocking(fd, false);
+
        /* We start with out doing nothing, and in doing our init. */
        conn->plan[IO_OUT].status = IO_UNSET;
 
@@ -275,8 +290,6 @@ static int do_connect(int fd, struct io_plan_arg *arg)
                return -1;
 
        if (err == 0) {
-               /* Restore blocking if it was initially. */
-               fcntl(fd, F_SETFL, arg->u1.s);
                return 1;
        } else if (err == EINPROGRESS)
                return 0;
@@ -289,21 +302,21 @@ 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_arg *arg = io_plan_arg(conn, IO_IN);
        int fd = io_conn_fd(conn);
 
-       /* Save old flags, set nonblock if not already. */
-       arg->u1.s = fcntl(fd, F_GETFL);
-       fcntl(fd, F_SETFL, arg->u1.s | O_NONBLOCK);
+       /* We don't actually need the arg, but we need it polling. */
+       io_plan_arg(conn, IO_OUT);
+
+       /* Note that io_new_conn() will make fd O_NONBLOCK */
 
        /* Immediate connect can happen. */
        if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0)
-               return set_always(conn, IO_IN, next, next_arg);
+               return set_always(conn, IO_OUT, next, next_arg);
 
        if (errno != EINPROGRESS)
                return io_close(conn);
 
-       return io_set_plan(conn, IO_IN, do_connect, next, next_arg);
+       return io_set_plan(conn, IO_OUT, do_connect, next, next_arg);
 }
 
 static struct io_plan *io_wait_dir(struct io_conn *conn,
@@ -384,10 +397,13 @@ void io_do_always(struct io_conn *conn)
                next_plan(conn, &conn->plan[IO_OUT]);
 }
 
-void io_do_wakeup(struct io_conn *conn, struct io_plan *plan)
+void io_do_wakeup(struct io_conn *conn, enum io_direction dir)
 {
+       struct io_plan *plan = &conn->plan[dir];
+
        assert(plan->status == IO_WAITING);
-       next_plan(conn, plan);
+
+       set_always(conn, dir, plan->next, plan->next_arg);
 }
 
 /* Close the connection, we're done. */
@@ -426,34 +442,12 @@ int io_conn_fd(const struct io_conn *conn)
        return conn->fd.fd;
 }
 
-void io_duplex_prepare(struct io_conn *conn)
-{
-       assert(conn->plan[IO_IN].status == IO_UNSET);
-       assert(conn->plan[IO_OUT].status == IO_UNSET);
-
-       /* We can't sync debug until we've set both: io_wait() and io_always
-        * can't handle it. */
-       conn->debug_saved = conn->debug;
-       conn->debug = false;
-}
-
-struct io_plan *io_duplex_(struct io_plan *in_plan, struct io_plan *out_plan)
+struct io_plan *io_duplex(struct io_conn *conn,
+                         struct io_plan *in_plan, struct io_plan *out_plan)
 {
-       struct io_conn *conn;
-
+       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);
-
-       /* Restore debug. */
-       conn = container_of(in_plan, struct io_conn, plan[IO_IN]);
-       conn->debug = conn->debug_saved;
-
-       /* Now set the plans again, to invoke sync debug. */
-       io_set_plan(conn, IO_OUT,
-                   out_plan->io, out_plan->next, out_plan->next_arg);
-       io_set_plan(conn, IO_IN,
-                   in_plan->io, in_plan->next, in_plan->next_arg);
-
        return out_plan + 1;
 }
 
@@ -487,40 +481,5 @@ struct io_plan *io_set_plan(struct io_conn *conn, enum io_direction dir,
        plan->next_arg = next_arg;
        assert(plan->status == IO_CLOSING || next != NULL);
 
-       if (!conn->debug)
-               return plan;
-
-       if (io_loop_return) {
-               io_debug_complete(conn);
-               return plan;
-       }
-
-       switch (plan->status) {
-       case IO_POLLING:
-               while (do_plan(conn, plan) == 0);
-               break;
-       /* Shouldn't happen, since you said you did plan! */
-       case IO_UNSET:
-               abort();
-       case IO_ALWAYS:
-               /* If other one is ALWAYS, leave in list! */
-               if (conn->plan[!dir].status != IO_ALWAYS)
-                       remove_from_always(conn);
-               next_plan(conn, plan);
-               break;
-       case IO_WAITING:
-       case IO_CLOSING:
-               io_debug_complete(conn);
-       }
-
        return plan;
 }
-
-void io_set_debug(struct io_conn *conn, bool debug)
-{
-       conn->debug = debug;
-}
-
-void io_debug_complete(struct io_conn *conn)
-{
-}