X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=0078fc658411c1d50e01a5c3e9eed278f5214a83;hp=7f3df7ed301728965cbc2fc203f0bcc46262ec11;hb=e40f5c50a7a930fc98974936b7366b498ebf984c;hpb=cf86c1e30648c9b482b92444c39ea6ea0ff936a8 diff --git a/ccan/io/poll.c b/ccan/io/poll.c index 7f3df7ed..0078fc65 100644 --- a/ccan/io/poll.c +++ b/ccan/io/poll.c @@ -7,11 +7,55 @@ #include #include #include +#include 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; +#ifdef DEBUG +static unsigned int io_loop_level; +static struct io_conn *free_later; +static void io_loop_enter(void) +{ + io_loop_level++; +} +static void io_loop_exit(void) +{ + io_loop_level--; + if (io_loop_level == 0) { + /* Delayed free. */ + while (free_later) { + struct io_conn *c = free_later; + free_later = c->finish_arg; + io_alloc.free(c); + } + } +} +static void free_conn(struct io_conn *conn) +{ + /* Only free on final exit: chain via finish. */ + if (io_loop_level > 1) { + struct io_conn *c; + for (c = free_later; c; c = c->finish_arg) + assert(c != conn); + conn->finish_arg = free_later; + free_later = conn; + } else + io_alloc.free(conn); +} +#else +static void io_loop_enter(void) +{ +} +static void io_loop_exit(void) +{ +} +static void free_conn(struct io_conn *conn) +{ + io_alloc.free(conn); +} +#endif static bool add_fd(struct fd *fd, short events) { @@ -20,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; @@ -63,8 +107,8 @@ static void del_fd(struct fd *fd) fds[n]->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; @@ -83,7 +127,13 @@ bool add_listener(struct io_listener *l) void backend_plan_changed(struct io_conn *conn) { - struct pollfd *pfd = &pollfds[conn->fd.backend_info]; + struct pollfd *pfd; + + /* This can happen with debugging and delayed free... */ + if (conn->fd.backend_info == -1) + return; + + pfd = &pollfds[conn->fd.backend_info]; if (pfd->events) num_waiting--; @@ -122,20 +172,25 @@ 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. */ 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) @@ -160,7 +215,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; @@ -175,12 +230,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(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) @@ -200,13 +259,16 @@ 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; + io_loop_enter(); + while (!io_loop_return) { int i, r, timeout = INT_MAX; struct timespec now; + bool some_timeouts = false; if (timeouts.base) { struct timespec first; @@ -221,7 +283,9 @@ void *io_loop(void) struct io_conn *conn = t->conn; /* Clear, in case timer re-adds */ t->conn = NULL; + set_current(conn); set_plan(conn, t->next(conn, t->next_arg)); + some_timeouts = true; } /* Now figure out how long to wait for the next one. */ @@ -233,11 +297,17 @@ 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; } + /* debug can recurse on io_loop; anything can change. */ + if (doing_debug() && some_timeouts) + continue; + if (num_fds == 0) break; @@ -265,27 +335,55 @@ 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))) continue; } } + if (doing_debug_on(c) && ready) { + *ready = c; + return NULL; + } io_ready(c); - } else if (events & POLLHUP) { + /* debug can recurse; anything can change. */ + if (doing_debug()) + break; + } else if (events & (POLLHUP|POLLNVAL|POLLERR)) { r--; - set_plan(c, io_close(c, NULL)); - if (c->duplex) - set_plan(c->duplex, - io_close(c->duplex, NULL)); + set_current(c); + errno = EBADF; + set_plan(c, io_close()); + if (c->duplex) { + set_current(c->duplex); + set_plan(c->duplex, io_close()); + } } } } - 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; + + io_loop_exit(); return ret; } + +void *io_loop(void) +{ + return do_io_loop(NULL); +}