X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=f9221d1ff6d91fc398563def5d24d33ec626bdcf;hb=57d9d1be33905691ec756b14b066181ca6850ced;hp=0cc84ad913bce7f2b58987407188b38fd0e7f9f9;hpb=42762758d98feb08b861361b7f695de2cad26b07;p=ccan

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 0cc84ad9..f9221d1f 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -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,49 @@ bool add_listener(struct io_listener *l)
 {
 	if (!add_fd(&l->fd, POLLIN))
 		return false;
-	num_waiting++;
 	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];
+
+	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++;
+
+	adjust_counts(conn->plan.state);
+}
+
 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++;
+	adjust_counts(c->plan.state);
 	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,9 +133,9 @@ static void del_conn(struct io_conn *conn)
 		conn->duplex->duplex = NULL;
 	} else
 		del_fd(&conn->fd);
-	if (conn->state == IO_FINISHED)
+	if (conn->plan.state == IO_FINISHED)
 		num_finished--;
-	else if (conn->state == IO_NEXT)
+	else if (conn->plan.state == IO_NEXT)
 		num_next--;
 }
 
@@ -112,50 +144,25 @@ 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 backend_set_state(struct io_conn *conn, struct io_plan plan)
 {
-	enum io_state state = from_ioplan(plan);
-	struct pollfd *pfd = &pollfds[conn->fd.backend_info];
-
-	if (pfd->events)
-		num_waiting--;
-
-	pfd->events = conn->pollflag;
-	if (conn->duplex) {
-		int mask = conn->duplex->pollflag;
-		/* You can't *both* read/write. */
-		assert(!mask || pfd->events != mask);
-		pfd->events |= mask;
-	}
-	if (pfd->events)
-		num_waiting++;
-
-	if (state == IO_NEXT)
-		num_next++;
-	else if (state == IO_FINISHED)
-		num_finished++;
-
-	conn->state = state;
+	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)
 {
-	struct io_conn *c;
 	int fd = accept(l->fd.fd, NULL, NULL);
 
 	/* FIXME: What to do here? */
 	if (fd < 0)
 		return;
-	c = io_new_conn(fd, l->next, l->finish, l->conn_arg);
-	if (!c) {
-		close(fd);
-		return;
-	}
+	l->init(fd, l->arg);
 }
 
 /* It's OK to miss some, as long as we make progress. */
@@ -174,12 +181,12 @@ static void finish_and_next(bool finished_only)
 			continue;
 		c = (void *)fds[i];
 		for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
-			if (c->state == IO_FINISHED) {
+			if (c->plan.state == IO_FINISHED) {
 				del_conn(c);
 				free(c);
 				i--;
-			} else if (!finished_only && c->state == IO_NEXT) {
-				backend_set_state(c, c->next(c, c->next_arg));
+			} else if (!finished_only && c->plan.state == IO_NEXT) {
+				backend_set_state(c, c->plan.next(c, c->plan.next_arg));
 				num_next--;
 			}
 		}
@@ -271,7 +278,7 @@ void *io_loop(void)
 			} else if (events & (POLLIN|POLLOUT)) {
 				r--;
 				if (c->duplex) {
-					int mask = c->duplex->pollflag;
+					int mask = c->duplex->plan.pollflag;
 					if (events & mask) {
 						ready(c->duplex);
 						events &= ~mask;