ccan/io: test read after hangup.

[ccan] / ccan / io / poll.c

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index da9107c2216a7b2234564ef4a915e523fbc62828..7f3df7ed301728965cbc2fc203f0bcc46262ec11 100644 (file)
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -8,7 +8,7 @@
 #include <sys/socket.h>
 #include <limits.h>
 
-static size_t num_fds = 0, max_fds = 0, num_finished = 0, num_waiting = 0;
+static size_t num_fds = 0, max_fds = 0, num_closing = 0, num_waiting = 0;
 static struct pollfd *pollfds = NULL;
 static struct fd **fds = NULL;
 static struct timers timeouts;
@@ -31,8 +31,12 @@ static bool add_fd(struct fd *fd, short events)
                max_fds = num;
        }
 
-       pollfds[num_fds].fd = fd->fd;
        pollfds[num_fds].events = events;
+       /* In case it's idle. */
+       if (!events)
+               pollfds[num_fds].fd = -fd->fd;
+       else
+               pollfds[num_fds].fd = fd->fd;
        pollfds[num_fds].revents = 0; /* In case we're iterating now */
        fds[num_fds] = fd;
        fd->backend_info = num_fds;
@@ -77,13 +81,7 @@ bool add_listener(struct io_listener *l)
        return true;
 }
 
-static void adjust_counts(enum io_state state)
-{
-       if (state == IO_FINISHED)
-               num_finished++;
-}
-
-static void update_pollevents(struct io_conn *conn)
+void backend_plan_changed(struct io_conn *conn)
 {
        struct pollfd *pfd = &pollfds[conn->fd.backend_info];
 
@@ -97,30 +95,35 @@ static void update_pollevents(struct io_conn *conn)
                assert(!mask || pfd->events != mask);
                pfd->events |= mask;
        }
-       if (pfd->events)
+       if (pfd->events) {
                num_waiting++;
+               pfd->fd = conn->fd.fd;
+       } else
+               pfd->fd = -conn->fd.fd;
 
-       adjust_counts(conn->plan.state);
+       if (!conn->plan.next)
+               num_closing++;
 }
 
 bool add_conn(struct io_conn *c)
 {
        if (!add_fd(&c->fd, c->plan.pollflag))
                return false;
-       adjust_counts(c->plan.state);
+       /* Immediate close is allowed. */
+       if (!c->plan.next)
+               num_closing++;
        return true;
 }
 
 bool add_duplex(struct io_conn *c)
 {
        c->fd.backend_info = c->duplex->fd.backend_info;
-       update_pollevents(c);
+       backend_plan_changed(c);
        return true;
 }
 
 static void del_conn(struct io_conn *conn)
 {
-       assert(conn->plan.state == IO_FINISHED);
        if (conn->finish)
                conn->finish(conn, conn->finish_arg);
        if (timeout_active(conn))
@@ -132,7 +135,7 @@ static void del_conn(struct io_conn *conn)
                conn->duplex->duplex = NULL;
        } else
                del_fd(&conn->fd);
-       num_finished--;
+       num_closing--;
 }
 
 void del_listener(struct io_listener *l)
@@ -140,15 +143,10 @@ void del_listener(struct io_listener *l)
        del_fd(&l->fd);
 }
 
-static void backend_set_state(struct io_conn *conn, struct io_plan plan)
+static void set_plan(struct io_conn *conn, struct io_plan plan)
 {
        conn->plan = plan;
-       update_pollevents(conn);
-}
-
-void backend_wakeup(struct io_conn *conn)
-{
-       update_pollevents(conn);
+       backend_plan_changed(conn);
 }
 
 static void accept_conn(struct io_listener *l)
@@ -169,14 +167,14 @@ static void finish_conns(void)
        for (i = 0; !io_loop_return && i < num_fds; i++) {
                struct io_conn *c, *duplex;
 
-               if (!num_finished)
+               if (!num_closing)
                        break;
 
                if (fds[i]->listener)
                        continue;
                c = (void *)fds[i];
                for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
-                       if (c->plan.state == IO_FINISHED) {
+                       if (!c->plan.next) {
                                del_conn(c);
                                free(c);
                                i--;
@@ -185,11 +183,6 @@ static void finish_conns(void)
        }
 }
 
-static void ready(struct io_conn *c)
-{
-       backend_set_state(c, do_ready(c));
-}
-
 void backend_add_timeout(struct io_conn *conn, struct timespec duration)
 {
        if (!timeouts.base)
@@ -228,7 +221,7 @@ void *io_loop(void)
                                struct io_conn *conn = t->conn;
                                /* Clear, in case timer re-adds */
                                t->conn = NULL;
-                               backend_set_state(conn, t->next(conn, t->next_arg));
+                               set_plan(conn, t->next(conn, t->next_arg));
                        }
 
                        /* Now figure out how long to wait for the next one. */
@@ -239,7 +232,7 @@ void *io_loop(void)
                        }
                }
 
-               if (num_finished) {
+               if (num_closing) {
                        finish_conns();
                        /* Could have started/finished more. */
                        continue;
@@ -272,25 +265,24 @@ void *io_loop(void)
                                if (c->duplex) {
                                        int mask = c->duplex->plan.pollflag;
                                        if (events & mask) {
-                                               ready(c->duplex);
+                                               io_ready(c->duplex);
                                                events &= ~mask;
                                                if (!(events&(POLLIN|POLLOUT)))
                                                        continue;
                                        }
                                }
-                               ready(c);
+                               io_ready(c);
                        } else if (events & POLLHUP) {
                                r--;
-                               backend_set_state(c, io_close(c, NULL));
+                               set_plan(c, io_close(c, NULL));
                                if (c->duplex)
-                                       backend_set_state(c->duplex,
-                                                         io_close(c->duplex,
-                                                                  NULL));
+                                       set_plan(c->duplex,
+                                                io_close(c->duplex, NULL));
                        }
                }
        }
 
-       while (num_finished)
+       while (num_closing)
                finish_conns();
 
        ret = io_loop_return;