X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=e3f595c9884c0d2fcea42d598ca3321d067069a8;hb=cdf62dce7077a9f9a818edbb67d31d033cbb73c6;hp=18691e17b4fc1c8a9247062be0fdaa5e84f9d170;hpb=f508ed408b230c21341778370ab04def8e7aba3a;p=ccan

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 18691e17..e3f595c9 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 
 static size_t num_fds = 0, max_fds = 0, num_closing = 0, num_waiting = 0;
+static bool some_always = false;
 static struct pollfd *pollfds = NULL;
 static struct fd **fds = NULL;
 static struct timers timeouts;
@@ -146,9 +147,9 @@ void backend_plan_changed(struct io_conn *conn)
 	if (pfd->events)
 		num_waiting--;
 
-	pfd->events = conn->plan.pollflag;
+	pfd->events = conn->plan.pollflag & (POLLIN|POLLOUT);
 	if (conn->duplex) {
-		int mask = conn->duplex->plan.pollflag;
+		int mask = conn->duplex->plan.pollflag & (POLLIN|POLLOUT);
 		/* You can't *both* read/write. */
 		assert(!mask || pfd->events != mask);
 		pfd->events |= mask;
@@ -161,15 +162,20 @@ void backend_plan_changed(struct io_conn *conn)
 
 	if (!conn->plan.next)
 		num_closing++;
+
+	if (conn->plan.pollflag == POLLALWAYS)
+		some_always = true;
 }
 
 bool add_conn(struct io_conn *c)
 {
-	if (!add_fd(&c->fd, c->plan.pollflag))
+	if (!add_fd(&c->fd, c->plan.pollflag & (POLLIN|POLLOUT)))
 		return false;
 	/* Immediate close is allowed. */
 	if (!c->plan.next)
 		num_closing++;
+	if (c->plan.pollflag == POLLALWAYS)
+		some_always = true;
 	return true;
 }
 
@@ -182,11 +188,6 @@ bool add_duplex(struct io_conn *c)
 
 void backend_del_conn(struct io_conn *conn)
 {
-	if (conn->finish) {
-		/* Saved by io_close */
-		errno = conn->plan.u1.s;
-		conn->finish(conn, conn->finish_arg);
-	}
 	if (timeout_active(conn))
 		backend_del_timeout(conn);
 	io_alloc.free(conn->timeout);
@@ -199,6 +200,11 @@ void backend_del_conn(struct io_conn *conn)
 	} else
 		del_fd(&conn->fd);
 	num_closing--;
+	if (conn->finish) {
+		/* Saved by io_close */
+		errno = conn->plan.u1.s;
+		conn->finish(conn, conn->finish_arg);
+	}
 	free_conn(conn);
 }
 
@@ -267,6 +273,26 @@ void backend_del_timeout(struct io_conn *conn)
 	conn->timeout->conn = NULL;
 }
 
+static void handle_always(void)
+{
+	int i;
+
+	some_always = false;
+
+	for (i = 0; i < num_fds && !io_loop_return; i++) {
+		struct io_conn *c = (void *)fds[i];
+
+		if (fds[i]->listener)
+			continue;
+
+		if (c->plan.pollflag == POLLALWAYS)
+			io_ready(c);
+
+		if (c->duplex && c->duplex->plan.pollflag == POLLALWAYS)
+			io_ready(c->duplex);
+	}
+}
+
 /* This is the main loop. */
 void *do_io_loop(struct io_conn **ready)
 {
@@ -317,6 +343,11 @@ void *do_io_loop(struct io_conn **ready)
 		if (doing_debug() && some_timeouts)
 			continue;
 
+		if (some_always) {
+			handle_always();
+			continue;
+		}
+
 		if (num_fds == 0)
 			break;