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

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 42ed67ad..18691e17 100644
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -7,6 +7,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <limits.h>
+#include <errno.h>
 
 static size_t num_fds = 0, max_fds = 0, num_closing = 0, num_waiting = 0;
 static struct pollfd *pollfds = NULL;
@@ -27,7 +28,7 @@ static void io_loop_exit(void)
 		while (free_later) {
 			struct io_conn *c = free_later;
 			free_later = c->finish_arg;
-			free(c);
+			io_alloc.free(c);
 		}
 	}
 }
@@ -41,7 +42,7 @@ static void free_conn(struct io_conn *conn)
 		conn->finish_arg = free_later;
 		free_later = conn;
 	} else
-		free(conn);
+		io_alloc.free(conn);
 }
 #else
 static void io_loop_enter(void)
@@ -52,7 +53,7 @@ static void io_loop_exit(void)
 }
 static void free_conn(struct io_conn *conn)
 {
-	free(conn);
+	io_alloc.free(conn);
 }
 #endif
 
@@ -63,11 +64,11 @@ static bool add_fd(struct fd *fd, short events)
 		struct fd **newfds;
 		size_t num = max_fds ? max_fds * 2 : 8;
 
-		newpollfds = realloc(pollfds, sizeof(*newpollfds) * num);
+		newpollfds = io_alloc.realloc(pollfds, sizeof(*newpollfds)*num);
 		if (!newpollfds)
 			return false;
 		pollfds = newpollfds;
-		newfds = realloc(fds, sizeof(*newfds) * num);
+		newfds = io_alloc.realloc(fds, sizeof(*newfds) * num);
 		if (!newfds)
 			return false;
 		fds = newfds;
@@ -104,10 +105,18 @@ static void del_fd(struct fd *fd)
 		fds[n] = fds[num_fds-1];
 		assert(fds[n]->backend_info == num_fds-1);
 		fds[n]->backend_info = n;
+		/* If that happens to be a duplex, move that too. */
+		if (!fds[n]->listener) {
+			struct io_conn *c = (void *)fds[n];
+			if (c->duplex) {
+				assert(c->duplex->fd.backend_info == num_fds-1);
+				c->duplex->fd.backend_info = n;
+			}
+		}
 	} else if (num_fds == 1) {
 		/* Free everything when no more fds. */
-		free(pollfds);
-		free(fds);
+		io_alloc.free(pollfds);
+		io_alloc.free(fds);
 		pollfds = NULL;
 		fds = NULL;
 		max_fds = 0;
@@ -171,21 +180,26 @@ bool add_duplex(struct io_conn *c)
 	return true;
 }
 
-static void del_conn(struct io_conn *conn)
+void backend_del_conn(struct io_conn *conn)
 {
-	if (conn->finish)
+	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);
-	free(conn->timeout);
+	io_alloc.free(conn->timeout);
 	if (conn->duplex) {
 		/* In case fds[] pointed to the other one. */
+		assert(conn->duplex->fd.backend_info == conn->fd.backend_info);
 		fds[conn->fd.backend_info] = &conn->duplex->fd;
 		conn->duplex->duplex = NULL;
 		conn->fd.backend_info = -1;
 	} else
 		del_fd(&conn->fd);
 	num_closing--;
+	free_conn(conn);
 }
 
 void del_listener(struct io_listener *l)
@@ -210,7 +224,7 @@ static void accept_conn(struct io_listener *l)
 }
 
 /* It's OK to miss some, as long as we make progress. */
-static void finish_conns(void)
+static bool finish_conns(struct io_conn **ready)
 {
 	unsigned int i;
 
@@ -225,12 +239,16 @@ static void finish_conns(void)
 		c = (void *)fds[i];
 		for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
 			if (!c->plan.next) {
-				del_conn(c);
-				free_conn(c);
+				if (doing_debug_on(c) && ready) {
+					*ready = c;
+					return true;
+				}
+				backend_del_conn(c);
 				i--;
 			}
 		}
 	}
+	return false;
 }
 
 void backend_add_timeout(struct io_conn *conn, struct timespec duration)
@@ -250,7 +268,7 @@ void backend_del_timeout(struct io_conn *conn)
 }
 
 /* This is the main loop. */
-void *io_loop(void)
+void *do_io_loop(struct io_conn **ready)
 {
 	void *ret;
 
@@ -288,7 +306,9 @@ void *io_loop(void)
 		}
 
 		if (num_closing) {
-			finish_conns();
+			/* If this finishes a debugging con, return now. */
+			if (finish_conns(ready))
+				return NULL;
 			/* Could have started/finished more. */
 			continue;
 		}
@@ -324,16 +344,29 @@ void *io_loop(void)
 				if (c->duplex) {
 					int mask = c->duplex->plan.pollflag;
 					if (events & mask) {
+						if (doing_debug_on(c->duplex)
+							&& ready) {
+							*ready = c->duplex;
+							return NULL;
+						}
 						io_ready(c->duplex);
 						events &= ~mask;
 						/* debug can recurse;
 						 * anything can change. */
 						if (doing_debug())
 							break;
-						if (!(events&(POLLIN|POLLOUT)))
+
+						/* If no events, or it closed
+						 * the duplex, continue. */
+						if (!(events&(POLLIN|POLLOUT))
+						    || !c->plan.next)
 							continue;
 					}
 				}
+				if (doing_debug_on(c) && ready) {
+					*ready = c;
+					return NULL;
+				}
 				io_ready(c);
 				/* debug can recurse; anything can change. */
 				if (doing_debug())
@@ -341,6 +374,7 @@ void *io_loop(void)
 			} else if (events & (POLLHUP|POLLNVAL|POLLERR)) {
 				r--;
 				set_current(c);
+				errno = EBADF;
 				set_plan(c, io_close());
 				if (c->duplex) {
 					set_current(c->duplex);
@@ -350,8 +384,10 @@ void *io_loop(void)
 		}
 	}
 
-	while (num_closing)
-		finish_conns();
+	while (num_closing && !io_loop_return) {
+		if (finish_conns(ready))
+			return NULL;
+	}
 
 	ret = io_loop_return;
 	io_loop_return = NULL;
@@ -359,3 +395,8 @@ void *io_loop(void)
 	io_loop_exit();
 	return ret;
 }
+
+void *io_loop(void)
+{
+	return do_io_loop(NULL);
+}