X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=7af61d5a2699cac1f73aa7470da4da19c37efb9d;hp=c1a624525e9185811ad9510eef555a4dd80bfb30;hb=8d94c52a7d6a51fd3a95734b2b4c7daa8c687d91;hpb=cdffdf5d61f8330cfc3467e73a84876eb3928e9b

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index c1a62452..7af61d5a 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -8,6 +8,9 @@
 #include <sys/socket.h>
 #include <limits.h>
 #include <errno.h>
+#include <ccan/list/list.h>
+#include <ccan/time/time.h>
+#include <ccan/timer/timer.h>
 
 static size_t num_fds = 0, max_fds = 0, num_waiting = 0;
 static struct pollfd *pollfds = NULL;
@@ -75,6 +78,12 @@ 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);
 }
 
@@ -85,17 +94,21 @@ bool add_listener(struct io_listener *l)
 	return true;
 }
 
-void backend_new_closing(struct io_conn *conn)
+void remove_from_always(struct io_conn *conn)
 {
-	/* Already on always list?  Remove it. */
-	if (conn->list) {
-		struct io_conn **p = &always;
+	struct io_conn **p = &always;
 
-		while (*p != conn)
-			p = &(*p)->list;
+	while (*p != conn)
+		p = &(*p)->list;
 
-		*p = conn->list;
-	}
+	*p = conn->list;
+}
+
+void backend_new_closing(struct io_conn *conn)
+{
+	/* Already on always list?  Remove it. */
+	if (conn->list)
+		remove_from_always(conn);
 
 	conn->list = closing;
 	closing = conn;
@@ -144,12 +157,12 @@ void backend_wake(const void *wait)
 
 		c = (void *)fds[i];
 		if (c->plan[IO_IN].status == IO_WAITING
-		    && c->plan[IO_IN].u1.const_vp == wait)
-			io_do_wakeup(c, &c->plan[IO_IN]);
+		    && c->plan[IO_IN].arg.u1.const_vp == wait)
+			io_do_wakeup(c, IO_IN);
 
 		if (c->plan[IO_OUT].status == IO_WAITING
-		    && c->plan[IO_OUT].u1.const_vp == wait)
-			io_do_wakeup(c, &c->plan[IO_OUT]);
+		    && c->plan[IO_OUT].arg.u1.const_vp == wait)
+			io_do_wakeup(c, IO_OUT);
 	}
 }
 
@@ -163,7 +176,7 @@ static void del_conn(struct io_conn *conn)
 	del_fd(&conn->fd);
 	if (conn->finish) {
 		/* Saved by io_close */
-		errno = conn->plan[IO_IN].u1.s;
+		errno = conn->plan[IO_IN].arg.u1.s;
 		conn->finish(conn, conn->finish_arg);
 	}
 	tal_free(conn);
@@ -223,12 +236,19 @@ static bool handle_always(void)
 }
 
 /* This is the main loop. */
-void *io_loop(void)
+void *io_loop(struct timers *timers, struct list_head *expired)
 {
 	void *ret;
 
+	/* if timers is NULL, expired must be.  If not, not. */
+	assert(!timers == !expired);
+
+	/* Make sure this is empty if we exit for some other reason. */
+	if (expired)
+		list_head_init(expired);
+
 	while (!io_loop_return) {
-		int i, r;
+		int i, r, ms_timeout = -1;
 
 		if (close_conns()) {
 			/* Could have started/finished more. */
@@ -247,7 +267,28 @@ void *io_loop(void)
 		/* You can't tell them all to go to sleep! */
 		assert(num_waiting);
 
-		r = poll(pollfds, num_fds, -1);
+		if (timers) {
+			struct timeabs now, first;
+
+			now = time_now();
+
+			/* Call functions for expired timers. */
+			timers_expire(timers, now, expired);
+			if (!list_empty(expired))
+				break;
+
+			/* Now figure out how long to wait for the next one. */
+			if (timer_earliest(timers, &first)) {
+				uint64_t next;
+				next = time_to_msec(time_between(first, now));
+				if (next < INT_MAX)
+					ms_timeout = next;
+				else
+					ms_timeout = INT_MAX;
+			}
+		}
+
+		r = poll(pollfds, num_fds, ms_timeout);
 		if (r < 0)
 			break;