X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=3266bdb2f5c737baecde62870445f90597895cfe;hb=f3c92802bfdb388f8c191cd1c682f90bc485b357;hp=078de1403ff8a886db059f14b2437799bab7edf3;hpb=43185ec669720903fa86aac5f2d1b1ee62e3a12b;p=ccan

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 078de140..3266bdb2 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);
 }
 
@@ -90,31 +96,21 @@ bool add_listener(struct io_listener *l)
 
 void remove_from_always(struct io_conn *conn)
 {
-	struct io_conn **p = &always;
-
-	while (*p != conn)
-		p = &(*p)->list;
-
-	*p = conn->list;
+	list_del_init(&conn->always);
 }
 
 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;
+	/* 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)
@@ -152,11 +148,11 @@ void backend_wake(const void *wait)
 		c = (void *)fds[i];
 		if (c->plan[IO_IN].status == IO_WAITING
 		    && c->plan[IO_IN].arg.u1.const_vp == wait)
-			io_do_wakeup(c, &c->plan[IO_IN]);
+			io_do_wakeup(c, IO_IN);
 
 		if (c->plan[IO_OUT].status == IO_WAITING
 		    && c->plan[IO_OUT].arg.u1.const_vp == wait)
-			io_do_wakeup(c, &c->plan[IO_OUT]);
+			io_do_wakeup(c, IO_OUT);
 	}
 }
 
@@ -196,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;
 	}
@@ -213,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;
 	}