io: make io_close_taken_fd() unset nonblocking on the fd.

[ccan] / ccan / io / poll.c

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 36af33ef0854de3323c8f29c4dc522c976091764..043feff74046226e61c367ad68644f3aba3fb54e 100644 (file)
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -86,19 +86,19 @@ static void del_fd(struct fd *fd)
        }
        num_fds--;
        fd->backend_info = -1;
+}
 
-       /* Closing a local socket doesn't wake poll() because other end
-        * has them open.  See 2.6.  When should I use shutdown()?
-        * in http://www.faqs.org/faqs/unix-faq/socket/ */
-       shutdown(fd->fd, SHUT_RDWR);
-
-       close(fd->fd);
+static void destroy_listener(struct io_listener *l)
+{
+       close(l->fd.fd);
+       del_fd(&l->fd);
 }
 
 bool add_listener(struct io_listener *l)
 {
        if (!add_fd(&l->fd, POLLIN))
                return false;
+       tal_add_destructor(l, destroy_listener);
        return true;
 }
 
@@ -107,13 +107,6 @@ void remove_from_always(struct io_conn *conn)
        list_del_init(&conn->always);
 }
 
-void backend_new_closing(struct io_conn *conn)
-{
-       /* In case it's on always list, remove it. */
-       list_del_init(&conn->always);
-       list_add_tail(&closing, &conn->closing);
-}
-
 void backend_new_always(struct io_conn *conn)
 {
        /* In case it's already in always list. */
@@ -164,25 +157,40 @@ void backend_wake(const void *wait)
        }
 }
 
-bool add_conn(struct io_conn *c)
+static void destroy_conn(struct io_conn *conn, bool close_fd)
 {
-       return add_fd(&c->fd, 0);
-}
+       int saved_errno = errno;
 
-static void del_conn(struct io_conn *conn)
-{
+       if (close_fd)
+               close(conn->fd.fd);
        del_fd(&conn->fd);
+       /* In case it's on always list, remove it. */
+       list_del_init(&conn->always);
+
+       /* errno saved/restored by tal_free itself. */
        if (conn->finish) {
-               /* Saved by io_close */
-               errno = conn->plan[IO_IN].arg.u1.s;
+               errno = saved_errno;
                conn->finish(conn, conn->finish_arg);
        }
-       tal_free(conn);
 }
 
-void del_listener(struct io_listener *l)
+static void destroy_conn_close_fd(struct io_conn *conn)
 {
-       del_fd(&l->fd);
+       destroy_conn(conn, true);
+}
+
+bool add_conn(struct io_conn *c)
+{
+       if (!add_fd(&c->fd, 0))
+               return false;
+       tal_add_destructor(c, destroy_conn_close_fd);
+       return true;
+}
+
+void cleanup_conn_without_close(struct io_conn *conn)
+{
+       tal_del_destructor(conn, destroy_conn_close_fd);
+       destroy_conn(conn, false);
 }
 
 static void accept_conn(struct io_listener *l)
@@ -196,22 +204,6 @@ static void accept_conn(struct io_listener *l)
        io_new_conn(l->ctx, fd, l->init, l->arg);
 }
 
-/* It's OK to miss some, as long as we make progress. */
-static bool close_conns(void)
-{
-       bool ret = false;
-       struct io_conn *conn;
-
-       while ((conn = list_pop(&closing, struct io_conn, closing)) != NULL) {
-               assert(conn->plan[IO_IN].status == IO_CLOSING);
-               assert(conn->plan[IO_OUT].status == IO_CLOSING);
-
-               del_conn(conn);
-               ret = true;
-       }
-       return ret;
-}
-
 static bool handle_always(void)
 {
        bool ret = false;
@@ -244,11 +236,6 @@ void *io_loop(struct timers *timers, struct timer **expired)
        while (!io_loop_return) {
                int i, r, ms_timeout = -1;
 
-               if (close_conns()) {
-                       /* Could have started/finished more. */
-                       continue;
-               }
-
                if (handle_always()) {
                        /* Could have started/finished more. */
                        continue;
@@ -294,9 +281,14 @@ void *io_loop(struct timers *timers, struct timer **expired)
                                break;
 
                        if (fds[i]->listener) {
+                               struct io_listener *l = (void *)fds[i];
                                if (events & POLLIN) {
-                                       accept_conn((void *)c);
+                                       accept_conn(l);
                                        r--;
+                               } else if (events & (POLLHUP|POLLNVAL|POLLERR)) {
+                                       r--;
+                                       errno = EBADF;
+                                       io_close_listener(l);
                                }
                        } else if (events & (POLLIN|POLLOUT)) {
                                r--;
@@ -309,8 +301,6 @@ void *io_loop(struct timers *timers, struct timer **expired)
                }
        }
 
-       close_conns();
-
        ret = io_loop_return;
        io_loop_return = NULL;