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

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index f9221d1f..46b2334e 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,14 +77,6 @@ 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)
 {
 	struct pollfd *pfd = &pollfds[conn->fd.backend_info];
@@ -102,14 +94,17 @@ 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;
 }
 
@@ -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)
@@ -166,28 +158,24 @@ 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--;
 			}
 		}
 	}
@@ -247,8 +235,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;
 		}
@@ -298,8 +286,8 @@ void *io_loop(void)
 		}
 	}
 
-	while (num_finished)
-		finish_and_next(true);
+	while (num_closing)
+		finish_conns();
 
 	ret = io_loop_return;
 	io_loop_return = NULL;