X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=9f9bb4a256168699eecec1dc062855475766e899;hp=f9221d1ff6d91fc398563def5d24d33ec626bdcf;hb=d0458a433876acc01b48f74c1c3b966bbc29de57;hpb=57d9d1be33905691ec756b14b066181ca6850ced

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index f9221d1f..9f9bb4a2 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -8,7 +8,7 @@
 #include <sys/socket.h>
 #include <limits.h>
 
-static size_t num_fds = 0, max_fds = 0, num_next = 0, num_finished = 0, num_waiting = 0;
+static size_t num_fds = 0, max_fds = 0, num_closing = 0, num_waiting = 0;
 static struct pollfd *pollfds = NULL;
 static struct fd **fds = NULL;
 static struct timers timeouts;
@@ -77,15 +77,7 @@ bool add_listener(struct io_listener *l)
 	return true;
 }
 
-static void adjust_counts(enum io_state state)
-{
-	if (state == IO_NEXT)
-		num_next++;
-	else if (state == IO_FINISHED)
-		num_finished++;
-}
-
-static void update_pollevents(struct io_conn *conn)
+void backend_plan_changed(struct io_conn *conn)
 {
 	struct pollfd *pfd = &pollfds[conn->fd.backend_info];
 
@@ -102,21 +94,24 @@ static void update_pollevents(struct io_conn *conn)
 	if (pfd->events)
 		num_waiting++;
 
-	adjust_counts(conn->plan.state);
+	if (!conn->plan.next)
+		num_closing++;
 }
 
 bool add_conn(struct io_conn *c)
 {
 	if (!add_fd(&c->fd, c->plan.pollflag))
 		return false;
-	adjust_counts(c->plan.state);
+	/* Immediate close is allowed. */
+	if (!c->plan.next)
+		num_closing++;
 	return true;
 }
 
 bool add_duplex(struct io_conn *c)
 {
 	c->fd.backend_info = c->duplex->fd.backend_info;
-	update_pollevents(c);
+	backend_plan_changed(c);
 	return true;
 }
 
@@ -133,10 +128,7 @@ static void del_conn(struct io_conn *conn)
 		conn->duplex->duplex = NULL;
 	} else
 		del_fd(&conn->fd);
-	if (conn->plan.state == IO_FINISHED)
-		num_finished--;
-	else if (conn->plan.state == IO_NEXT)
-		num_next--;
+	num_closing--;
 }
 
 void del_listener(struct io_listener *l)
@@ -144,15 +136,10 @@ void del_listener(struct io_listener *l)
 	del_fd(&l->fd);
 }
 
-static void backend_set_state(struct io_conn *conn, struct io_plan plan)
+static void set_plan(struct io_conn *conn, struct io_plan plan)
 {
 	conn->plan = plan;
-	update_pollevents(conn);
-}
-
-void backend_wakeup(struct io_conn *conn)
-{
-	update_pollevents(conn);
+	backend_plan_changed(conn);
 }
 
 static void accept_conn(struct io_listener *l)
@@ -166,38 +153,29 @@ static void accept_conn(struct io_listener *l)
 }
 
 /* It's OK to miss some, as long as we make progress. */
-static void finish_and_next(bool finished_only)
+static void finish_conns(void)
 {
 	unsigned int i;
 
 	for (i = 0; !io_loop_return && i < num_fds; i++) {
 		struct io_conn *c, *duplex;
 
-		if (!num_finished) {
-			if (finished_only || num_next == 0)
-				break;
-		}
+		if (!num_closing)
+			break;
+
 		if (fds[i]->listener)
 			continue;
 		c = (void *)fds[i];
 		for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
-			if (c->plan.state == IO_FINISHED) {
+			if (!c->plan.next) {
 				del_conn(c);
 				free(c);
 				i--;
-			} else if (!finished_only && c->plan.state == IO_NEXT) {
-				backend_set_state(c, c->plan.next(c, c->plan.next_arg));
-				num_next--;
 			}
 		}
 	}
 }
 
-static void ready(struct io_conn *c)
-{
-	backend_set_state(c, do_ready(c));
-}
-
 void backend_add_timeout(struct io_conn *conn, struct timespec duration)
 {
 	if (!timeouts.base)
@@ -236,7 +214,7 @@ void *io_loop(void)
 				struct io_conn *conn = t->conn;
 				/* Clear, in case timer re-adds */
 				t->conn = NULL;
-				backend_set_state(conn, t->next(conn, t->next_arg));
+				set_plan(conn, t->next(conn, t->next_arg));
 			}
 
 			/* Now figure out how long to wait for the next one. */
@@ -247,8 +225,8 @@ void *io_loop(void)
 			}
 		}
 
-		if (num_finished || num_next) {
-			finish_and_next(false);
+		if (num_closing) {
+			finish_conns();
 			/* Could have started/finished more. */
 			continue;
 		}
@@ -280,26 +258,25 @@ void *io_loop(void)
 				if (c->duplex) {
 					int mask = c->duplex->plan.pollflag;
 					if (events & mask) {
-						ready(c->duplex);
+						io_ready(c->duplex);
 						events &= ~mask;
 						if (!(events&(POLLIN|POLLOUT)))
 							continue;
 					}
 				}
-				ready(c);
+				io_ready(c);
 			} else if (events & POLLHUP) {
 				r--;
-				backend_set_state(c, io_close(c, NULL));
+				set_plan(c, io_close(c, NULL));
 				if (c->duplex)
-					backend_set_state(c->duplex,
-							  io_close(c->duplex,
-								   NULL));
+					set_plan(c->duplex,
+						 io_close(c->duplex, NULL));
 			}
 		}
 	}
 
-	while (num_finished)
-		finish_and_next(true);
+	while (num_closing)
+		finish_conns();
 
 	ret = io_loop_return;
 	io_loop_return = NULL;