X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=a4e83ed761e77251767b01b3e3f5c5dd3492bfcd;hp=36af33ef0854de3323c8f29c4dc522c976091764;hb=e846b1a93ecf096164ff2c4faaf4a89c24a0e76b;hpb=61f58ff94e35c9b8ac5488554e2554bc5c9888b3

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 36af33ef..a4e83ed7 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -17,6 +17,7 @@ static struct fd **fds = NULL;
 static LIST_HEAD(closing);
 static LIST_HEAD(always);
 static struct timemono (*nowfn)(void) = time_mono;
+static int (*pollfn)(struct pollfd *fds, nfds_t nfds, int timeout) = poll;
 
 struct timemono (*io_time_override(struct timemono (*now)(void)))(void)
 {
@@ -25,6 +26,13 @@ struct timemono (*io_time_override(struct timemono (*now)(void)))(void)
 	return old;
 }
 
+int (*io_poll_override(int (*poll)(struct pollfd *fds, nfds_t nfds, int timeout)))(struct pollfd *, nfds_t, int)
+{
+	int (*old)(struct pollfd *fds, nfds_t nfds, int timeout) = pollfn;
+	pollfn = poll;
+	return old;
+}
+
 static bool add_fd(struct fd *fd, short events)
 {
 	if (!max_fds) {
@@ -86,19 +94,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 +115,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 +165,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 +212,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 +244,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;
@@ -282,7 +277,7 @@ void *io_loop(struct timers *timers, struct timer **expired)
 			}
 		}
 
-		r = poll(pollfds, num_fds, ms_timeout);
+		r = pollfn(pollfds, num_fds, ms_timeout);
 		if (r < 0)
 			break;
 
@@ -294,9 +289,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 +309,6 @@ void *io_loop(struct timers *timers, struct timer **expired)
 		}
 	}
 
-	close_conns();
-
 	ret = io_loop_return;
 	io_loop_return = NULL;