X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=9f9bb4a256168699eecec1dc062855475766e899;hp=94536728d91f48956902b74ab52fa66185e0d57f;hb=d0458a433876acc01b48f74c1c3b966bbc29de57;hpb=1fe2db9cbe84812e1465db36f538a222e9984c93 diff --git a/ccan/io/poll.c b/ccan/io/poll.c index 94536728..9f9bb4a2 100644 --- a/ccan/io/poll.c +++ b/ccan/io/poll.c @@ -8,7 +8,7 @@ #include #include -static size_t num_fds = 0, max_fds = 0, num_next = 0, num_finished = 0, num_waiting = 0; +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; @@ -37,6 +37,9 @@ static bool add_fd(struct fd *fd, short events) fds[num_fds] = fd; fd->backend_info = num_fds; num_fds++; + if (events) + num_waiting++; + return true; } @@ -46,6 +49,8 @@ static void del_fd(struct fd *fd) assert(n != -1); assert(n < num_fds); + if (pollfds[n].events) + num_waiting--; if (n != num_fds - 1) { /* Move last one over us. */ pollfds[n] = pollfds[num_fds-1]; @@ -69,29 +74,51 @@ bool add_listener(struct io_listener *l) { if (!add_fd(&l->fd, POLLIN)) return false; - num_waiting++; return true; } +void backend_plan_changed(struct io_conn *conn) +{ + struct pollfd *pfd = &pollfds[conn->fd.backend_info]; + + if (pfd->events) + num_waiting--; + + pfd->events = conn->plan.pollflag; + if (conn->duplex) { + int mask = conn->duplex->plan.pollflag; + /* You can't *both* read/write. */ + assert(!mask || pfd->events != mask); + pfd->events |= mask; + } + if (pfd->events) + num_waiting++; + + if (!conn->plan.next) + num_closing++; +} + bool add_conn(struct io_conn *c) { - if (!add_fd(&c->fd, 0)) + if (!add_fd(&c->fd, c->plan.pollflag)) return false; - num_next++; + /* Immediate close is allowed. */ + if (!c->plan.next) + num_closing++; return true; } bool add_duplex(struct io_conn *c) { c->fd.backend_info = c->duplex->fd.backend_info; - num_next++; + backend_plan_changed(c); return true; } static void del_conn(struct io_conn *conn) { - if (conn->fd.finish) - conn->fd.finish(conn, conn->fd.finish_arg); + if (conn->finish) + conn->finish(conn, conn->finish_arg); if (timeout_active(conn)) backend_del_timeout(conn); free(conn->timeout); @@ -101,10 +128,7 @@ static void del_conn(struct io_conn *conn) conn->duplex->duplex = NULL; } else del_fd(&conn->fd); - if (conn->state == FINISHED) - num_finished--; - else if (conn->state == NEXT) - num_next--; + num_closing--; } void del_listener(struct io_listener *l) @@ -112,96 +136,46 @@ void del_listener(struct io_listener *l) del_fd(&l->fd); } -static int pollmask(enum io_state state) -{ - switch (state) { - case READ: - case READPART: - return POLLIN; - case WRITE: - case WRITEPART: - return POLLOUT; - default: - return 0; - } -} - -void backend_set_state(struct io_conn *conn, struct io_op *op) +static void set_plan(struct io_conn *conn, struct io_plan plan) { - enum io_state state = from_ioop(op); - struct pollfd *pfd = &pollfds[conn->fd.backend_info]; - - if (pfd->events) - num_waiting--; - - pfd->events = pollmask(state); - if (conn->duplex) { - int mask = pollmask(conn->duplex->state); - /* You can't *both* read/write. */ - assert(!mask || pfd->events != mask); - pfd->events |= mask; - } - if (pfd->events) - num_waiting++; - - if (state == NEXT) - num_next++; - else if (state == FINISHED) - num_finished++; - - conn->state = state; + conn->plan = plan; + backend_plan_changed(conn); } static void accept_conn(struct io_listener *l) { - struct io_conn *c; int fd = accept(l->fd.fd, NULL, NULL); /* FIXME: What to do here? */ if (fd < 0) return; - c = io_new_conn(fd, l->fd.next, l->fd.finish, l->fd.next_arg); - if (!c) { - close(fd); - return; - } + l->init(fd, l->arg); } /* It's OK to miss some, as long as we make progress. */ -static void finish_and_next(bool finished_only) +static void finish_conns(void) { unsigned int i; for (i = 0; !io_loop_return && i < num_fds; i++) { struct io_conn *c, *duplex; - if (!num_finished) { - if (finished_only || num_next == 0) - break; - } + if (!num_closing) + break; + if (fds[i]->listener) continue; c = (void *)fds[i]; for (duplex = c->duplex; c; c = duplex, duplex = NULL) { - if (c->state == FINISHED) { + if (!c->plan.next) { del_conn(c); free(c); i--; - } else if (!finished_only && c->state == NEXT) { - backend_set_state(c, - c->fd.next(c, - c->fd.next_arg)); - num_next--; } } } } -static void ready(struct io_conn *c) -{ - backend_set_state(c, do_ready(c)); -} - void backend_add_timeout(struct io_conn *conn, struct timespec duration) { if (!timeouts.base) @@ -240,7 +214,7 @@ void *io_loop(void) struct io_conn *conn = t->conn; /* Clear, in case timer re-adds */ t->conn = NULL; - backend_set_state(conn, t->next(conn, t->next_arg)); + set_plan(conn, t->next(conn, t->next_arg)); } /* Now figure out how long to wait for the next one. */ @@ -251,8 +225,8 @@ void *io_loop(void) } } - if (num_finished || num_next) { - finish_and_next(false); + if (num_closing) { + finish_conns(); /* Could have started/finished more. */ continue; } @@ -282,28 +256,27 @@ void *io_loop(void) } else if (events & (POLLIN|POLLOUT)) { r--; if (c->duplex) { - int mask = pollmask(c->duplex->state); + int mask = c->duplex->plan.pollflag; if (events & mask) { - ready(c->duplex); + io_ready(c->duplex); events &= ~mask; if (!(events&(POLLIN|POLLOUT))) continue; } } - ready(c); + io_ready(c); } else if (events & POLLHUP) { r--; - backend_set_state(c, io_close(c, NULL)); + set_plan(c, io_close(c, NULL)); if (c->duplex) - backend_set_state(c->duplex, - io_close(c->duplex, - NULL)); + set_plan(c->duplex, + io_close(c->duplex, NULL)); } } } - while (num_finished) - finish_and_next(true); + while (num_closing) + finish_conns(); ret = io_loop_return; io_loop_return = NULL;