X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=a02152e3792ae07569d4a75b1ca423ecce5fb626;hp=98a64f42fbe4336283be8f5371688da439943ac6;hb=b089d462e533d2b304cc28b9ad277cbfa53f12ce;hpb=17a81baf84a9c8f89603173be3169a0a2017702d diff --git a/ccan/io/poll.c b/ccan/io/poll.c index 98a64f42..a02152e3 100644 --- a/ccan/io/poll.c +++ b/ccan/io/poll.c @@ -11,12 +11,12 @@ #include #include -static size_t num_fds = 0, max_fds = 0, num_waiting = 0; +static size_t num_fds = 0, max_fds = 0, num_waiting = 0, num_always = 0, max_always = 0, num_exclusive = 0; static struct pollfd *pollfds = NULL; static struct fd **fds = NULL; -static LIST_HEAD(closing); -static LIST_HEAD(always); +static struct io_plan **always = NULL; 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) { @@ -25,6 +25,13 @@ struct timemono (*io_time_override(struct timemono (*now)(void)))(void) 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) { if (!max_fds) { @@ -51,12 +58,13 @@ static bool add_fd(struct fd *fd, short events) pollfds[num_fds].events = events; /* In case it's idle. */ if (!events) - pollfds[num_fds].fd = -fd->fd; + pollfds[num_fds].fd = -fd->fd - 1; else pollfds[num_fds].fd = fd->fd; pollfds[num_fds].revents = 0; /* In case we're iterating now */ fds[num_fds] = fd; fd->backend_info = num_fds; + fd->exclusive[0] = fd->exclusive[1] = false; num_fds++; if (events) num_waiting++; @@ -86,6 +94,11 @@ static void del_fd(struct fd *fd) } num_fds--; fd->backend_info = -1; + + if (fd->exclusive[IO_IN]) + num_exclusive--; + if (fd->exclusive[IO_OUT]) + num_exclusive--; } static void destroy_listener(struct io_listener *l) @@ -102,39 +115,92 @@ bool add_listener(struct io_listener *l) return true; } -void remove_from_always(struct io_conn *conn) +static int find_always(const struct io_plan *plan) { - list_del_init(&conn->always); + for (size_t i = 0; i < num_always; i++) + if (always[i] == plan) + return i; + return -1; } -void backend_new_always(struct io_conn *conn) +static void remove_from_always(const struct io_plan *plan) { - /* In case it's already in always list. */ - list_del(&conn->always); - list_add_tail(&always, &conn->always); + int pos; + + if (plan->status != IO_ALWAYS) + return; + + pos = find_always(plan); + assert(pos >= 0); + + /* Move last one down if we made a hole */ + if (pos != num_always-1) + always[pos] = always[num_always-1]; + num_always--; + + /* Only free if no fds left either. */ + if (num_always == 0 && max_fds == 0) { + tal_free(always); + max_always = 0; + } } -void backend_new_plan(struct io_conn *conn) +bool backend_new_always(struct io_plan *plan) { - struct pollfd *pfd = &pollfds[conn->fd.backend_info]; + assert(find_always(plan) == -1); - if (pfd->events) - num_waiting--; + if (!max_always) { + assert(num_always == 0); + always = tal_arr(NULL, struct io_plan *, 8); + if (!always) + return false; + max_always = 8; + } + + if (num_always + 1 > max_always) { + size_t num = max_always * 2; + + if (!tal_resize(&always, num)) + return false; + max_always = num; + } + + always[num_always++] = plan; + return true; +} + +static void setup_pfd(struct io_conn *conn, struct pollfd *pfd) +{ + assert(pfd == &pollfds[conn->fd.backend_info]); pfd->events = 0; - if (conn->plan[IO_IN].status == IO_POLLING) + if (conn->plan[IO_IN].status == IO_POLLING_NOTSTARTED + || conn->plan[IO_IN].status == IO_POLLING_STARTED) pfd->events |= POLLIN; - if (conn->plan[IO_OUT].status == IO_POLLING) + if (conn->plan[IO_OUT].status == IO_POLLING_NOTSTARTED + || conn->plan[IO_OUT].status == IO_POLLING_STARTED) pfd->events |= POLLOUT; if (pfd->events) { - num_waiting++; pfd->fd = conn->fd.fd; } else { - pfd->fd = -conn->fd.fd; + pfd->fd = -conn->fd.fd - 1; } } +void backend_new_plan(struct io_conn *conn) +{ + struct pollfd *pfd = &pollfds[conn->fd.backend_info]; + + if (pfd->events) + num_waiting--; + + setup_pfd(conn, pfd); + + if (pfd->events) + num_waiting++; +} + void backend_wake(const void *wait) { unsigned int i; @@ -164,8 +230,9 @@ static void destroy_conn(struct io_conn *conn, bool close_fd) 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); + + remove_from_always(&conn->plan[IO_IN]); + remove_from_always(&conn->plan[IO_OUT]); /* errno saved/restored by tal_free itself. */ if (conn->finish) { @@ -187,11 +254,10 @@ bool add_conn(struct io_conn *c) return true; } -struct io_plan *io_close_taken_fd(struct io_conn *conn) +void cleanup_conn_without_close(struct io_conn *conn) { tal_del_destructor(conn, destroy_conn_close_fd); destroy_conn(conn, false); - return io_close(conn); } static void accept_conn(struct io_listener *l) @@ -205,21 +271,88 @@ static void accept_conn(struct io_listener *l) io_new_conn(l->ctx, fd, l->init, l->arg); } -static bool handle_always(void) +/* Return pointer to exclusive flag for this plan. */ +static bool *exclusive(struct io_plan *plan) { - bool ret = false; struct io_conn *conn; - 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); + conn = container_of(plan, struct io_conn, plan[plan->dir]); + return &conn->fd.exclusive[plan->dir]; +} + +/* For simplicity, we do one always at a time */ +static bool handle_always(void) +{ + /* Backwards is simple easier to remove entries */ + for (int i = num_always - 1; i >= 0; i--) { + struct io_plan *plan = always[i]; + + if (num_exclusive && !*exclusive(plan)) + continue; + /* Remove first: it might re-add */ + if (i != num_always-1) + always[i] = always[num_always-1]; + num_always--; + io_do_always(plan); + return true; + } - /* Re-initialize, for next time. */ - list_node_init(&conn->always); - io_do_always(conn); - ret = true; + return false; +} + +bool backend_set_exclusive(struct io_plan *plan, bool excl) +{ + bool *excl_ptr = exclusive(plan); + + if (excl != *excl_ptr) { + *excl_ptr = excl; + if (!excl) + num_exclusive--; + else + num_exclusive++; + } + + return num_exclusive != 0; +} + +/* FIXME: We could do this once at set_exclusive time, and catch everywhere + * else that we manipulate events. */ +static void exclude_pollfds(void) +{ + if (num_exclusive == 0) + return; + + for (size_t i = 0; i < num_fds; i++) { + struct pollfd *pfd = &pollfds[fds[i]->backend_info]; + + if (!fds[i]->exclusive[IO_IN]) + pfd->events &= ~POLLIN; + if (!fds[i]->exclusive[IO_OUT]) + pfd->events &= ~POLLOUT; + + /* If we're not listening, we don't want error events + * either. */ + if (!pfd->events) + pfd->fd = -fds[i]->fd - 1; + } +} + +static void restore_pollfds(void) +{ + if (num_exclusive == 0) + return; + + for (size_t i = 0; i < num_fds; i++) { + struct pollfd *pfd = &pollfds[fds[i]->backend_info]; + + if (fds[i]->listener) { + pfd->events = POLLIN; + pfd->fd = fds[i]->fd; + } else { + struct io_conn *conn = (void *)fds[i]; + setup_pfd(conn, pfd); + } } - return ret; } /* This is the main loop. */ @@ -270,21 +403,38 @@ void *io_loop(struct timers *timers, struct timer **expired) } } - r = poll(pollfds, num_fds, ms_timeout); - if (r < 0) + /* We do this temporarily, assuming exclusive is unusual */ + exclude_pollfds(); + r = pollfn(pollfds, num_fds, ms_timeout); + restore_pollfds(); + + if (r < 0) { + /* Signals shouldn't break us, unless they set + * io_loop_return. */ + if (errno == EINTR) + continue; break; + } for (i = 0; i < num_fds && !io_loop_return; i++) { struct io_conn *c = (void *)fds[i]; int events = pollfds[i].revents; + /* Clear so we don't get confused if exclusive next time */ + pollfds[i].revents = 0; + if (r == 0) 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--;