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

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index c30bea17..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;
@@ -37,6 +37,9 @@ static bool add_fd(struct fd *fd, short events)
 	fds[num_fds] = fd;
 	fd->backend_info = num_fds;
 	num_fds++;
+	if (events)
+		num_waiting++;
+
 	return true;
 }
 
@@ -46,6 +49,8 @@ static void del_fd(struct fd *fd)
 
 	assert(n != -1);
 	assert(n < num_fds);
+	if (pollfds[n].events)
+		num_waiting--;
 	if (n != num_fds - 1) {
 		/* Move last one over us. */
 		pollfds[n] = pollfds[num_fds-1];
@@ -69,22 +74,44 @@ bool add_listener(struct io_listener *l)
 {
 	if (!add_fd(&l->fd, POLLIN))
 		return false;
-	num_waiting++;
 	return true;
 }
 
+static void update_pollevents(struct io_conn *conn)
+{
+	struct pollfd *pfd = &pollfds[conn->fd.backend_info];
+
+	if (pfd->events)
+		num_waiting--;
+
+	pfd->events = conn->plan.pollflag;
+	if (conn->duplex) {
+		int mask = conn->duplex->plan.pollflag;
+		/* You can't *both* read/write. */
+		assert(!mask || pfd->events != mask);
+		pfd->events |= mask;
+	}
+	if (pfd->events)
+		num_waiting++;
+
+	if (!conn->plan.next)
+		num_closing++;
+}
+
 bool add_conn(struct io_conn *c)
 {
-	if (!add_fd(&c->fd, 0))
+	if (!add_fd(&c->fd, c->plan.pollflag))
 		return false;
-	num_next++;
+	/* 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;
-	num_next++;
+	update_pollevents(c);
 	return true;
 }
 
@@ -101,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)
@@ -114,32 +138,13 @@ void del_listener(struct io_listener *l)
 
 static void backend_set_state(struct io_conn *conn, struct io_plan plan)
 {
-	struct pollfd *pfd = &pollfds[conn->fd.backend_info];
-
-	if (pfd->events)
-		num_waiting--;
-
-	pfd->events = plan.pollflag;
-	if (conn->duplex) {
-		int mask = conn->duplex->plan.pollflag;
-		/* You can't *both* read/write. */
-		assert(!mask || pfd->events != mask);
-		pfd->events |= mask;
-	}
-	if (pfd->events)
-		num_waiting++;
-
-	if (plan.state == IO_NEXT)
-		num_next++;
-	else if (plan.state == IO_FINISHED)
-		num_finished++;
-
 	conn->plan = plan;
+	update_pollevents(conn);
 }
 
 void backend_wakeup(struct io_conn *conn)
 {
-	num_next++;
+	update_pollevents(conn);
 }
 
 static void accept_conn(struct io_listener *l)
@@ -153,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--;
 			}
 		}
 	}
@@ -234,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;
 		}
@@ -285,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;