X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=b005a97e4b1d07879a4e281a8d48276baaac2fa1;hp=7af61d5a2699cac1f73aa7470da4da19c37efb9d;hb=e2d15a2bcb78dba323c4a807543fcc0cb1b03ef0;hpb=8d94c52a7d6a51fd3a95734b2b4c7daa8c687d91 diff --git a/ccan/io/poll.c b/ccan/io/poll.c index 7af61d5a..b005a97e 100644 --- a/ccan/io/poll.c +++ b/ccan/io/poll.c @@ -8,14 +8,30 @@ #include #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) { @@ -78,49 +94,32 @@ static void del_fd(struct fd *fd) } num_fds--; fd->backend_info = -1; +} - /* Closing a local socket doesn't wake poll() because other end - * has them open. See 2.6. When should I use shutdown()? - * in http://www.faqs.org/faqs/unix-faq/socket/ */ - shutdown(fd->fd, SHUT_RDWR); - - 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 remove_from_always(struct io_conn *conn) { - struct io_conn **p = &always; - - while (*p != conn) - p = &(*p)->list; - - *p = conn->list; -} - -void backend_new_closing(struct io_conn *conn) -{ - /* Already on always list? Remove it. */ - if (conn->list) - remove_from_always(conn); - - 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) @@ -131,9 +130,11 @@ void backend_new_plan(struct io_conn *conn) num_waiting--; 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) { @@ -166,25 +167,40 @@ void backend_wake(const void *wait) } } -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].arg.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) @@ -198,37 +214,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; } @@ -236,25 +232,20 @@ static bool handle_always(void) } /* This is the main loop. */ -void *io_loop(struct timers *timers, struct list_head *expired) +void *io_loop(struct timers *timers, struct timer **expired) { void *ret; /* if timers is NULL, expired must be. If not, not. */ assert(!timers == !expired); - /* Make sure this is empty if we exit for some other reason. */ + /* Make sure this is NULL if we exit for some other reason. */ if (expired) - list_head_init(expired); + *expired = NULL; while (!io_loop_return) { int i, r, ms_timeout = -1; - if (close_conns()) { - /* Could have started/finished more. */ - continue; - } - if (handle_always()) { /* Could have started/finished more. */ continue; @@ -268,19 +259,19 @@ void *io_loop(struct timers *timers, struct list_head *expired) assert(num_waiting); if (timers) { - struct timeabs now, first; + struct timemono now, first; - now = time_now(); + now = nowfn(); /* Call functions for expired timers. */ - timers_expire(timers, now, expired); - if (!list_empty(expired)) + *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(time_between(first, now)); + next = time_to_msec(timemono_between(first, now)); if (next < INT_MAX) ms_timeout = next; else @@ -288,9 +279,14 @@ void *io_loop(struct timers *timers, struct list_head *expired) } } - r = poll(pollfds, num_fds, ms_timeout); - if (r < 0) + r = pollfn(pollfds, num_fds, ms_timeout); + 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]; @@ -300,9 +296,14 @@ void *io_loop(struct timers *timers, struct list_head *expired) 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--; @@ -315,8 +316,6 @@ void *io_loop(struct timers *timers, struct list_head *expired) } } - close_conns(); - ret = io_loop_return; io_loop_return = NULL;