X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=a4e83ed761e77251767b01b3e3f5c5dd3492bfcd;hp=c1a624525e9185811ad9510eef555a4dd80bfb30;hb=e846b1a93ecf096164ff2c4faaf4a89c24a0e76b;hpb=cdffdf5d61f8330cfc3467e73a84876eb3928e9b diff --git a/ccan/io/poll.c b/ccan/io/poll.c index c1a62452..a4e83ed7 100644 --- a/ccan/io/poll.c +++ b/ccan/io/poll.c @@ -8,11 +8,30 @@ #include #include #include +#include +#include static size_t num_fds = 0, max_fds = 0, num_waiting = 0; static struct pollfd *pollfds = NULL; static struct fd **fds = NULL; -static struct io_conn *closing = NULL, *always = NULL; +static LIST_HEAD(closing); +static LIST_HEAD(always); +static struct timemono (*nowfn)(void) = time_mono; +static int (*pollfn)(struct pollfd *fds, nfds_t nfds, int timeout) = poll; + +struct timemono (*io_time_override(struct timemono (*now)(void)))(void) +{ + struct timemono (*old)(void) = nowfn; + nowfn = now; + return old; +} + +int (*io_poll_override(int (*poll)(struct pollfd *fds, nfds_t nfds, int timeout)))(struct pollfd *, nfds_t, int) +{ + int (*old)(struct pollfd *fds, nfds_t nfds, int timeout) = pollfn; + pollfn = poll; + return old; +} static bool add_fd(struct fd *fd, short events) { @@ -75,39 +94,32 @@ static void del_fd(struct fd *fd) } num_fds--; fd->backend_info = -1; - close(fd->fd); +} + +static void destroy_listener(struct io_listener *l) +{ + close(l->fd.fd); + del_fd(&l->fd); } bool add_listener(struct io_listener *l) { if (!add_fd(&l->fd, POLLIN)) return false; + tal_add_destructor(l, destroy_listener); return true; } -void backend_new_closing(struct io_conn *conn) +void remove_from_always(struct io_conn *conn) { - /* Already on always list? Remove it. */ - if (conn->list) { - struct io_conn **p = &always; - - while (*p != conn) - p = &(*p)->list; - - *p = conn->list; - } - - conn->list = closing; - closing = conn; + list_del_init(&conn->always); } void backend_new_always(struct io_conn *conn) { - /* May already be in always list (other plan), or closing. */ - if (!conn->list) { - conn->list = always; - always = conn; - } + /* In case it's already in always list. */ + list_del(&conn->always); + list_add_tail(&always, &conn->always); } void backend_new_plan(struct io_conn *conn) @@ -144,34 +156,49 @@ void backend_wake(const void *wait) c = (void *)fds[i]; if (c->plan[IO_IN].status == IO_WAITING - && c->plan[IO_IN].u1.const_vp == wait) - io_do_wakeup(c, &c->plan[IO_IN]); + && c->plan[IO_IN].arg.u1.const_vp == wait) + io_do_wakeup(c, IO_IN); if (c->plan[IO_OUT].status == IO_WAITING - && c->plan[IO_OUT].u1.const_vp == wait) - io_do_wakeup(c, &c->plan[IO_OUT]); + && c->plan[IO_OUT].arg.u1.const_vp == wait) + io_do_wakeup(c, IO_OUT); } } -bool add_conn(struct io_conn *c) +static void destroy_conn(struct io_conn *conn, bool close_fd) { - return add_fd(&c->fd, 0); -} + int saved_errno = errno; -static void del_conn(struct io_conn *conn) -{ + if (close_fd) + close(conn->fd.fd); del_fd(&conn->fd); + /* In case it's on always list, remove it. */ + list_del_init(&conn->always); + + /* errno saved/restored by tal_free itself. */ if (conn->finish) { - /* Saved by io_close */ - errno = conn->plan[IO_IN].u1.s; + errno = saved_errno; conn->finish(conn, conn->finish_arg); } - tal_free(conn); } -void del_listener(struct io_listener *l) +static void destroy_conn_close_fd(struct io_conn *conn) { - del_fd(&l->fd); + destroy_conn(conn, true); +} + +bool add_conn(struct io_conn *c) +{ + if (!add_fd(&c->fd, 0)) + return false; + tal_add_destructor(c, destroy_conn_close_fd); + return true; +} + +void cleanup_conn_without_close(struct io_conn *conn) +{ + tal_del_destructor(conn, destroy_conn_close_fd); + destroy_conn(conn, false); } static void accept_conn(struct io_listener *l) @@ -185,37 +212,17 @@ static void accept_conn(struct io_listener *l) io_new_conn(l->ctx, fd, l->init, l->arg); } -/* It's OK to miss some, as long as we make progress. */ -static bool close_conns(void) -{ - bool ret = false; - - while (closing) { - struct io_conn *conn = closing; - - assert(conn->plan[IO_IN].status == IO_CLOSING); - assert(conn->plan[IO_OUT].status == IO_CLOSING); - - closing = closing->list; - del_conn(conn); - ret = true; - } - return ret; -} - static bool handle_always(void) { bool ret = false; + struct io_conn *conn; - while (always) { - struct io_conn *conn = always; - + while ((conn = list_pop(&always, struct io_conn, always)) != NULL) { assert(conn->plan[IO_IN].status == IO_ALWAYS || conn->plan[IO_OUT].status == IO_ALWAYS); - /* Remove from list, and mark it so it knows that. */ - always = always->list; - conn->list = NULL; + /* Re-initialize, for next time. */ + list_node_init(&conn->always); io_do_always(conn); ret = true; } @@ -223,17 +230,19 @@ static bool handle_always(void) } /* This is the main loop. */ -void *io_loop(void) +void *io_loop(struct timers *timers, struct timer **expired) { void *ret; - while (!io_loop_return) { - int i, r; + /* if timers is NULL, expired must be. If not, not. */ + assert(!timers == !expired); - if (close_conns()) { - /* Could have started/finished more. */ - continue; - } + /* Make sure this is NULL if we exit for some other reason. */ + if (expired) + *expired = NULL; + + while (!io_loop_return) { + int i, r, ms_timeout = -1; if (handle_always()) { /* Could have started/finished more. */ @@ -247,7 +256,28 @@ void *io_loop(void) /* You can't tell them all to go to sleep! */ assert(num_waiting); - r = poll(pollfds, num_fds, -1); + if (timers) { + struct timemono now, first; + + now = nowfn(); + + /* Call functions for expired timers. */ + *expired = timers_expire(timers, now); + if (*expired) + break; + + /* Now figure out how long to wait for the next one. */ + if (timer_earliest(timers, &first)) { + uint64_t next; + next = time_to_msec(timemono_between(first, now)); + if (next < INT_MAX) + ms_timeout = next; + else + ms_timeout = INT_MAX; + } + } + + r = pollfn(pollfds, num_fds, ms_timeout); if (r < 0) break; @@ -259,9 +289,14 @@ void *io_loop(void) break; if (fds[i]->listener) { + struct io_listener *l = (void *)fds[i]; if (events & POLLIN) { - accept_conn((void *)c); + accept_conn(l); + r--; + } else if (events & (POLLHUP|POLLNVAL|POLLERR)) { r--; + errno = EBADF; + io_close_listener(l); } } else if (events & (POLLIN|POLLOUT)) { r--; @@ -274,8 +309,6 @@ void *io_loop(void) } } - close_conns(); - ret = io_loop_return; io_loop_return = NULL;