X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=b1a28fdb3f6dbb866b449ac77ddd00cae46d8463;hp=e4058766e9f6ed9661d992ed0a603af1b2ae9520;hb=36bfb66bdf74f4f3382cd00dae7b899e80e2cf1a;hpb=94dd4c2bddd0dc080ad5b85465fa3f45f486967a;ds=sidebyside

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index e4058766..b1a28fdb 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -8,14 +8,14 @@
 #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;
 static struct fd **fds = NULL;
-static struct io_conn *closing = NULL, *always = NULL;
+static LIST_HEAD(closing);
+static LIST_HEAD(always);
 
 static bool add_fd(struct fd *fd, short events)
 {
@@ -78,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);
 }
 
@@ -88,29 +94,23 @@ 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;
-
-		while (*p != conn)
-			p = &(*p)->list;
-
-		*p = conn->list;
-	}
+	list_del_init(&conn->always);
+}
 
-	conn->list = closing;
-	closing = conn;
+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)
 {
-	/* May already be in always list (other plan), or closing. */
-	if (!conn->list) {
-		conn->list = always;
-		always = conn;
-	}
+	/* In case it's already in always list. */
+	list_del(&conn->always);
+	list_add_tail(&always, &conn->always);
 }
 
 void backend_new_plan(struct io_conn *conn)
@@ -147,12 +147,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);
 	}
 }
 
@@ -166,7 +166,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);
@@ -192,14 +192,12 @@ static void accept_conn(struct io_listener *l)
 static bool close_conns(void)
 {
 	bool ret = false;
+	struct io_conn *conn;
 
-	while (closing) {
-		struct io_conn *conn = closing;
-
+	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);
 
-		closing = closing->list;
 		del_conn(conn);
 		ret = true;
 	}
@@ -209,16 +207,14 @@ static bool close_conns(void)
 static bool handle_always(void)
 {
 	bool ret = false;
+	struct io_conn *conn;
 
-	while (always) {
-		struct io_conn *conn = always;
-
+	while ((conn = list_pop(&always, struct io_conn, always)) != NULL) {
 		assert(conn->plan[IO_IN].status == IO_ALWAYS
 		       || conn->plan[IO_OUT].status == IO_ALWAYS);
 
-		/* Remove from list, and mark it so it knows that. */
-		always = always->list;
-		conn->list = NULL;
+		/* Re-initialize, for next time. */
+		list_node_init(&conn->always);
 		io_do_always(conn);
 		ret = true;
 	}
@@ -226,16 +222,16 @@ static bool handle_always(void)
 }
 
 /* This is the main loop. */
-void *io_loop(struct timers *timers, struct list_head *expired)
+void *io_loop(struct timers *timers, struct timer **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. */
+	/* Make sure this is NULL if we exit for some other reason. */
 	if (expired)
-		list_head_init(expired);
+		*expired = NULL;
 
 	while (!io_loop_return) {
 		int i, r, ms_timeout = -1;
@@ -263,8 +259,8 @@ void *io_loop(struct timers *timers, struct list_head *expired)
 			now = time_now();
 
 			/* Call functions for expired timers. */
-			timers_expire(timers, now, expired);
-			if (!list_empty(expired))
+			*expired = timers_expire(timers, now);
+			if (*expired)
 				break;
 
 			/* Now figure out how long to wait for the next one. */