-/* Licensed under BSD-MIT - see LICENSE file for details */
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
#include "io.h"
#include "backend.h"
#include <assert.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <limits.h>
-static size_t num_fds = 0, max_fds = 0, num_next = 0, num_finished = 0;
+static size_t num_fds = 0, max_fds = 0, num_next = 0, num_finished = 0, num_waiting = 0;
static struct pollfd *pollfds = NULL;
static struct fd **fds = NULL;
+static struct timers timeouts;
static bool add_fd(struct fd *fd, short events)
{
bool add_listener(struct io_listener *l)
{
- return add_fd(&l->fd, POLLIN);
+ if (!add_fd(&l->fd, POLLIN))
+ return false;
+ num_waiting++;
+ return true;
}
bool add_conn(struct io_conn *c)
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);
if (conn->duplex) {
/* In case fds[] pointed to the other one. */
fds[conn->fd.backend_info] = &conn->duplex->fd;
conn->duplex->duplex = NULL;
} else
del_fd(&conn->fd);
- if (conn->state == FINISHED)
+ if (conn->state == IO_FINISHED)
num_finished--;
- else if (conn->state == NEXT)
+ else if (conn->state == IO_NEXT)
num_next--;
}
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)
+void backend_set_state(struct io_conn *conn, struct io_plan *plan)
{
- enum io_state state = from_ioop(op);
+ enum io_state state = from_ioplan(plan);
struct pollfd *pfd = &pollfds[conn->fd.backend_info];
- pfd->events = pollmask(state);
+ if (pfd->events)
+ num_waiting--;
+
+ pfd->events = conn->pollflag;
if (conn->duplex) {
- int mask = pollmask(conn->duplex->state);
+ int mask = conn->duplex->pollflag;
/* You can't *both* read/write. */
assert(!mask || pfd->events != mask);
pfd->events |= mask;
}
+ if (pfd->events)
+ num_waiting++;
- if (state == NEXT)
+ if (state == IO_NEXT)
num_next++;
- else if (state == FINISHED)
+ else if (state == IO_FINISHED)
num_finished++;
conn->state = state;
/* FIXME: What to do here? */
if (fd < 0)
return;
- c = io_new_conn(fd, l->fd.next, l->fd.finish, l->fd.next_arg);
+ c = io_new_conn(fd, l->next, l->finish, l->conn_arg);
if (!c) {
close(fd);
return;
continue;
c = (void *)fds[i];
for (duplex = c->duplex; c; c = duplex, duplex = NULL) {
- if (c->state == FINISHED) {
+ if (c->state == IO_FINISHED) {
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));
+ } else if (!finished_only && c->state == IO_NEXT) {
+ backend_set_state(c, c->next(c, c->next_arg));
num_next--;
}
}
backend_set_state(c, do_ready(c));
}
+void backend_add_timeout(struct io_conn *conn, struct timespec duration)
+{
+ if (!timeouts.base)
+ timers_init(&timeouts, time_now());
+ timer_add(&timeouts, &conn->timeout->timer,
+ time_add(time_now(), duration));
+ conn->timeout->conn = conn;
+}
+
+void backend_del_timeout(struct io_conn *conn)
+{
+ assert(conn->timeout->conn == conn);
+ timer_del(&timeouts, &conn->timeout->timer);
+ conn->timeout->conn = NULL;
+}
+
/* This is the main loop. */
void *io_loop(void)
{
void *ret;
while (!io_loop_return) {
- int i, r;
+ int i, r, timeout = INT_MAX;
+ struct timespec now;
+
+ if (timeouts.base) {
+ struct timespec first;
+ struct list_head expired;
+ struct io_timeout *t;
+
+ now = time_now();
+
+ /* Call functions for expired timers. */
+ timers_expire(&timeouts, now, &expired);
+ while ((t = list_pop(&expired, struct io_timeout, timer.list))) {
+ 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));
+ }
+
+ /* Now figure out how long to wait for the next one. */
+ if (timer_earliest(&timeouts, &first)) {
+ uint64_t f = time_to_msec(time_sub(first, now));
+ if (f < INT_MAX)
+ timeout = f;
+ }
+ }
if (num_finished || num_next) {
finish_and_next(false);
if (num_fds == 0)
break;
- r = poll(pollfds, num_fds, -1);
+ /* You can't tell them all to go to sleep! */
+ assert(num_waiting);
+
+ r = poll(pollfds, num_fds, timeout);
if (r < 0)
break;
struct io_conn *c = (void *)fds[i];
int events = pollfds[i].revents;
+ if (r == 0)
+ break;
+
if (fds[i]->listener) {
- if (events & POLLIN)
+ if (events & POLLIN) {
accept_conn((void *)c);
+ r--;
+ }
} else if (events & (POLLIN|POLLOUT)) {
+ r--;
if (c->duplex) {
- int mask = pollmask(c->duplex->state);
+ int mask = c->duplex->pollflag;
if (events & mask) {
ready(c->duplex);
events &= ~mask;
}
ready(c);
} else if (events & POLLHUP) {
+ r--;
backend_set_state(c, io_close(c, NULL));
if (c->duplex)
backend_set_state(c->duplex,
io_close(c->duplex,
NULL));
}
-
}
}
projects / ccan / blobdiff