#include <sys/socket.h>
#include <limits.h>
#include <errno.h>
-#include <ccan/list/list.h>
#include <ccan/time/time.h>
#include <ccan/timer/timer.h>
-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;
static struct pollfd *pollfds = NULL;
static struct fd **fds = NULL;
-static struct io_conn *closing = NULL, *always = NULL;
+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)
+{
+ 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)
{
}
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 remove_from_always(struct io_conn *conn)
+static int find_always(const struct io_plan *plan)
{
- struct io_conn **p = &always;
-
- while (*p != conn)
- p = &(*p)->list;
-
- *p = conn->list;
+ for (size_t i = 0; i < num_always; i++)
+ if (always[i] == plan)
+ return i;
+ return -1;
}
-void backend_new_closing(struct io_conn *conn)
+static void remove_from_always(const struct io_plan *plan)
{
- /* Already on always list? Remove it. */
- if (conn->list)
- remove_from_always(conn);
+ int pos;
+
+ if (plan->status != IO_ALWAYS)
+ return;
+
+ pos = find_always(plan);
+ assert(pos >= 0);
- conn->list = closing;
- closing = conn;
+ /* Move last one down if we made a hole */
+ if (pos != num_always-1)
+ always[pos] = always[num_always-1];
+ num_always--;
}
-void backend_new_always(struct io_conn *conn)
+bool backend_new_always(struct io_plan *plan)
{
- /* May already be in always list (other plan), or closing. */
- if (!conn->list) {
- conn->list = always;
- always = conn;
+ assert(find_always(plan) == -1);
+
+ 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;
}
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) {
c = (void *)fds[i];
if (c->plan[IO_IN].status == IO_WAITING
&& c->plan[IO_IN].arg.u1.const_vp == wait)
- io_do_wakeup(c, &c->plan[IO_IN]);
+ io_do_wakeup(c, IO_IN);
if (c->plan[IO_OUT].status == IO_WAITING
&& c->plan[IO_OUT].arg.u1.const_vp == wait)
- io_do_wakeup(c, &c->plan[IO_OUT]);
+ 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);
+
+ remove_from_always(&conn->plan[IO_IN]);
+ remove_from_always(&conn->plan[IO_OUT]);
+
+ /* 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)
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;
- while (always) {
- struct io_conn *conn = always;
-
- 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;
- io_do_always(conn);
+ while (num_always > 0) {
+ /* Remove first: it might re-add */
+ struct io_plan *plan = always[num_always-1];
+ num_always--;
+ io_do_always(plan);
ret = true;
}
return ret;
}
/* 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;
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
}
}
- 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];
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--;
}
}
- close_conns();
-
ret = io_loop_return;
io_loop_return = NULL;
projects / ccan / blobdiff