#include <errno.h>
#include <stdlib.h>
#include <assert.h>
-#include <poll.h>
#include <unistd.h>
#include <fcntl.h>
void *io_loop_return;
-struct io_alloc io_alloc = {
- malloc, realloc, free
-};
-
-#ifdef DEBUG
-/* Set to skip the next plan. */
-bool io_plan_nodebug;
-/* The current connection to apply plan to. */
-struct io_conn *current;
-/* User-defined function to select which connection(s) to debug. */
-bool (*io_debug_conn)(struct io_conn *conn);
-/* Set when we wake up an connection we are debugging. */
-bool io_debug_wakeup;
-
-struct io_plan io_debug(struct io_plan plan)
-{
- struct io_conn *ready = NULL;
-
- if (io_plan_nodebug) {
- io_plan_nodebug = false;
- return plan;
- }
-
- if (!current || !doing_debug_on(current)) {
- if (!io_debug_wakeup)
- return plan;
- }
-
- io_debug_wakeup = false;
- current->plan = plan;
- backend_plan_changed(current);
-
- /* If it closed, close duplex. */
- if (!current->plan.next && current->duplex) {
- current->duplex->plan = io_close_();
- backend_plan_changed(current->duplex);
- }
-
- /* Call back into the loop immediately. */
- io_loop_return = do_io_loop(&ready);
-
- if (ready) {
- set_current(ready);
- if (!ready->plan.next) {
- /* Call finish function immediately. */
- if (ready->finish) {
- errno = ready->plan.u1.s;
- ready->finish(ready, ready->finish_arg);
- ready->finish = NULL;
- }
- backend_del_conn(ready);
- } else {
- /* Calls back in itself, via io_debug_io(). */
- if (ready->plan.io(ready->fd.fd, &ready->plan) != 2)
- abort();
- }
- set_current(NULL);
- }
-
- /* Return a do-nothing plan, so backend_plan_changed in
- * io_ready doesn't do anything (it's already been called). */
- return io_idle_();
-}
-
-int io_debug_io(int ret)
-{
- /* Cache it for debugging; current changes. */
- struct io_conn *conn = current;
- int saved_errno = errno;
-
- if (!doing_debug_on(conn))
- return ret;
-
- /* These will all go linearly through the io_debug() path above. */
- switch (ret) {
- case -1:
- /* This will call io_debug above. */
- errno = saved_errno;
- io_close();
- break;
- case 0: /* Keep going with plan. */
- io_debug(conn->plan);
- break;
- case 1: /* Done: get next plan. */
- if (timeout_active(conn))
- backend_del_timeout(conn);
- conn->plan.next(conn, conn->plan.next_arg);
- break;
- default:
- abort();
- }
-
- /* Normally-invalid value, used for sanity check. */
- return 2;
-}
-
-static void debug_io_wake(struct io_conn *conn)
-{
- /* We want linear if we wake a debugged connection, too. */
- if (io_debug_conn && io_debug_conn(conn))
- io_debug_wakeup = true;
-}
-
-/* Counterpart to io_plan_no_debug(), called in macros in io.h */
-static void io_plan_debug_again(void)
-{
- io_plan_nodebug = false;
-}
-#else
-static void debug_io_wake(struct io_conn *conn)
-{
-}
-static void io_plan_debug_again(void)
-{
-}
-#endif
-
-struct io_listener *io_new_listener_(int fd,
- void (*init)(int fd, void *arg),
+struct io_listener *io_new_listener_(const tal_t *ctx, int fd,
+ struct io_plan *(*init)(struct io_conn *,
+ void *),
void *arg)
{
- struct io_listener *l = io_alloc.alloc(sizeof(*l));
-
+ struct io_listener *l = tal(ctx, struct io_listener);
if (!l)
return NULL;
l->fd.fd = fd;
l->init = init;
l->arg = arg;
- if (!add_listener(l)) {
- io_alloc.free(l);
- return NULL;
- }
+ l->ctx = ctx;
+ if (!add_listener(l))
+ return tal_free(l);
return l;
}
{
close(l->fd.fd);
del_listener(l);
- io_alloc.free(l);
+ tal_free(l);
+}
+
+static struct io_plan *io_never_called(struct io_conn *conn, void *arg)
+{
+ abort();
}
-struct io_conn *io_new_conn_(int fd, struct io_plan plan)
+static void next_plan(struct io_conn *conn, struct io_plan *plan)
{
- struct io_conn *conn = io_alloc.alloc(sizeof(*conn));
+ struct io_plan *(*next)(struct io_conn *, void *arg);
+
+ next = plan->next;
+
+ plan->status = IO_UNSET;
+ plan->io = NULL;
+ plan->next = io_never_called;
+
+ plan = next(conn, plan->next_arg);
- io_plan_debug_again();
+ /* It should have set a plan inside this conn (or duplex) */
+ assert(plan == &conn->plan[IO_IN]
+ || plan == &conn->plan[IO_OUT]
+ || plan == &conn->plan[2]);
+ assert(conn->plan[IO_IN].status != IO_UNSET
+ || conn->plan[IO_OUT].status != IO_UNSET);
+
+ backend_new_plan(conn);
+}
+
+struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
+ struct io_plan *(*init)(struct io_conn *, void *),
+ void *arg)
+{
+ struct io_conn *conn = tal(ctx, struct io_conn);
if (!conn)
return NULL;
conn->fd.listener = false;
conn->fd.fd = fd;
- conn->plan = plan;
conn->finish = NULL;
conn->finish_arg = NULL;
- conn->duplex = NULL;
- conn->timeout = NULL;
- if (!add_conn(conn)) {
- io_alloc.free(conn);
- return NULL;
- }
+ conn->list = NULL;
+
+ if (!add_conn(conn))
+ return tal_free(conn);
+
+ /* We start with out doing nothing, and in doing our init. */
+ conn->plan[IO_OUT].status = IO_UNSET;
+
+ conn->plan[IO_IN].next = init;
+ conn->plan[IO_IN].next_arg = arg;
+ next_plan(conn, &conn->plan[IO_IN]);
+
return conn;
}
conn->finish_arg = arg;
}
-struct io_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
+struct io_plan *io_get_plan(struct io_conn *conn, enum io_direction dir)
{
- struct io_conn *conn;
+ assert(conn->plan[dir].status == IO_UNSET);
- io_plan_debug_again();
-
- assert(!old->duplex);
+ conn->plan[dir].status = IO_POLLING;
+ return &conn->plan[dir];
+}
- conn = io_alloc.alloc(sizeof(*conn));
- if (!conn)
- return NULL;
+static struct io_plan *set_always(struct io_conn *conn,
+ struct io_plan *plan,
+ struct io_plan *(*next)(struct io_conn *,
+ void *),
+ void *arg)
+{
+ plan->next = next;
+ plan->next_arg = arg;
+ plan->status = IO_ALWAYS;
- conn->fd.listener = false;
- conn->fd.fd = old->fd.fd;
- conn->plan = plan;
- conn->duplex = old;
- conn->finish = NULL;
- conn->finish_arg = NULL;
- conn->timeout = NULL;
- if (!add_duplex(conn)) {
- io_alloc.free(conn);
- return NULL;
- }
- old->duplex = conn;
- return conn;
+ backend_new_always(conn);
+ return plan;
}
-bool io_timeout_(struct io_conn *conn, struct timespec ts,
- struct io_plan (*cb)(struct io_conn *, void *), void *arg)
+struct io_plan *io_always_(struct io_conn *conn,
+ struct io_plan *(*next)(struct io_conn *, void *),
+ void *arg)
{
- assert(cb);
-
- if (!conn->timeout) {
- conn->timeout = io_alloc.alloc(sizeof(*conn->timeout));
- if (!conn->timeout)
- return false;
- } else
- assert(!timeout_active(conn));
-
- conn->timeout->next = cb;
- conn->timeout->next_arg = arg;
- backend_add_timeout(conn, ts);
- return true;
+ struct io_plan *plan;
+
+ /* If we're duplex, we want this on the current plan. Otherwise,
+ * doesn't matter. */
+ if (conn->plan[IO_IN].status == IO_UNSET)
+ plan = io_get_plan(conn, IO_IN);
+ else
+ plan = io_get_plan(conn, IO_OUT);
+
+ assert(next);
+ set_always(conn, plan, next, arg);
+
+ return plan;
}
-/* Returns true if we're finished. */
static int do_write(int fd, struct io_plan *plan)
{
ssize_t ret = write(fd, plan->u1.cp, plan->u2.s);
if (ret < 0)
- return io_debug_io(-1);
+ return -1;
plan->u1.cp += ret;
plan->u2.s -= ret;
- return io_debug_io(plan->u2.s == 0);
+ return plan->u2.s == 0;
}
/* Queue some data to be written. */
-struct io_plan io_write_(const void *data, size_t len,
- struct io_plan (*cb)(struct io_conn *, void *),
- void *arg)
+struct io_plan *io_write_(struct io_conn *conn, const void *data, size_t len,
+ struct io_plan *(*next)(struct io_conn *, void *),
+ void *arg)
{
- struct io_plan plan;
+ struct io_plan *plan = io_get_plan(conn, IO_OUT);
+
+ assert(next);
- assert(cb);
- plan.u1.const_vp = data;
- plan.u2.s = len;
- plan.io = do_write;
- plan.next = cb;
- plan.next_arg = arg;
- plan.pollflag = POLLOUT;
+ if (len == 0)
+ return set_always(conn, plan, next, arg);
+
+ plan->u1.const_vp = data;
+ plan->u2.s = len;
+ plan->io = do_write;
+ plan->next = next;
+ plan->next_arg = arg;
return plan;
}
{
ssize_t ret = read(fd, plan->u1.cp, plan->u2.s);
if (ret <= 0)
- return io_debug_io(-1);
+ return -1;
plan->u1.cp += ret;
plan->u2.s -= ret;
- return io_debug_io(plan->u2.s == 0);
+ return plan->u2.s == 0;
}
/* Queue a request to read into a buffer. */
-struct io_plan io_read_(void *data, size_t len,
- struct io_plan (*cb)(struct io_conn *, void *),
- void *arg)
+struct io_plan *io_read_(struct io_conn *conn,
+ void *data, size_t len,
+ struct io_plan *(*next)(struct io_conn *, void *),
+ void *arg)
{
- struct io_plan plan;
+ struct io_plan *plan = io_get_plan(conn, IO_IN);
+
+ assert(next);
- assert(cb);
- plan.u1.cp = data;
- plan.u2.s = len;
- plan.io = do_read;
- plan.next = cb;
- plan.next_arg = arg;
- plan.pollflag = POLLIN;
+ if (len == 0)
+ return set_always(conn, plan, next, arg);
+
+ plan->u1.cp = data;
+ plan->u2.s = len;
+ plan->io = do_read;
+ plan->next = next;
+ plan->next_arg = arg;
return plan;
}
{
ssize_t ret = read(fd, plan->u1.cp, *(size_t *)plan->u2.vp);
if (ret <= 0)
- return io_debug_io(-1);
+ return -1;
*(size_t *)plan->u2.vp = ret;
- return io_debug_io(1);
+ return 1;
}
/* Queue a partial request to read into a buffer. */
-struct io_plan io_read_partial_(void *data, size_t *len,
- struct io_plan (*cb)(struct io_conn *, void *),
- void *arg)
+struct io_plan *io_read_partial_(struct io_conn *conn,
+ void *data, size_t maxlen, size_t *len,
+ struct io_plan *(*next)(struct io_conn *,
+ void *),
+ void *arg)
{
- struct io_plan plan;
+ struct io_plan *plan = io_get_plan(conn, IO_IN);
+
+ assert(next);
- assert(cb);
- plan.u1.cp = data;
- plan.u2.vp = len;
- plan.io = do_read_partial;
- plan.next = cb;
- plan.next_arg = arg;
- plan.pollflag = POLLIN;
+ if (maxlen == 0)
+ return set_always(conn, plan, next, arg);
+
+ plan->u1.cp = data;
+ /* We store the max len in here temporarily. */
+ *len = maxlen;
+ plan->u2.vp = len;
+ plan->io = do_read_partial;
+ plan->next = next;
+ plan->next_arg = arg;
return plan;
}
{
ssize_t ret = write(fd, plan->u1.cp, *(size_t *)plan->u2.vp);
if (ret < 0)
- return io_debug_io(-1);
+ return -1;
*(size_t *)plan->u2.vp = ret;
- return io_debug_io(1);
+ return 1;
}
/* Queue a partial write request. */
-struct io_plan io_write_partial_(const void *data, size_t *len,
- struct io_plan (*cb)(struct io_conn*, void *),
- void *arg)
+struct io_plan *io_write_partial_(struct io_conn *conn,
+ const void *data, size_t maxlen, size_t *len,
+ struct io_plan *(*next)(struct io_conn *,
+ void*),
+ void *arg)
{
- struct io_plan plan;
+ struct io_plan *plan = io_get_plan(conn, IO_OUT);
- assert(cb);
- plan.u1.const_vp = data;
- plan.u2.vp = len;
- plan.io = do_write_partial;
- plan.next = cb;
- plan.next_arg = arg;
- plan.pollflag = POLLOUT;
+ assert(next);
- return plan;
-}
+ if (maxlen == 0)
+ return set_always(conn, plan, next, arg);
-static int already_connected(int fd, struct io_plan *plan)
-{
- return io_debug_io(1);
+ plan->u1.const_vp = data;
+ /* We store the max len in here temporarily. */
+ *len = maxlen;
+ plan->u2.vp = len;
+ plan->io = do_write_partial;
+ plan->next = next;
+ plan->next_arg = arg;
+
+ return plan;
}
static int do_connect(int fd, struct io_plan *plan)
if (err == 0) {
/* Restore blocking if it was initially. */
- fcntl(fd, F_SETFD, plan->u1.s);
+ fcntl(fd, F_SETFL, plan->u1.s);
return 1;
- }
- return 0;
+ } else if (err == EINPROGRESS)
+ return 0;
+
+ errno = err;
+ return -1;
}
-struct io_plan io_connect_(int fd, const struct addrinfo *addr,
- struct io_plan (*cb)(struct io_conn*, void *),
- void *arg)
+struct io_plan *io_connect_(struct io_conn *conn, const struct addrinfo *addr,
+ struct io_plan *(*next)(struct io_conn *, void *),
+ void *arg)
{
- struct io_plan plan;
-
- assert(cb);
+ struct io_plan *plan = io_get_plan(conn, IO_IN);
+ int fd = io_conn_fd(conn);
- plan.next = cb;
- plan.next_arg = arg;
+ assert(next);
/* Save old flags, set nonblock if not already. */
- plan.u1.s = fcntl(fd, F_GETFD);
- fcntl(fd, F_SETFD, plan.u1.s | O_NONBLOCK);
+ plan->u1.s = fcntl(fd, F_GETFL);
+ fcntl(fd, F_SETFL, plan->u1.s | O_NONBLOCK);
/* Immediate connect can happen. */
- if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0) {
- /* Dummy will be called immediately. */
- plan.pollflag = POLLOUT;
- plan.io = already_connected;
- } else {
- if (errno != EINPROGRESS)
- return io_close_();
-
- plan.pollflag = POLLIN;
- plan.io = do_connect;
- }
+ if (connect(fd, addr->ai_addr, addr->ai_addrlen) == 0)
+ return set_always(conn, plan, next, arg);
+
+ if (errno != EINPROGRESS)
+ return io_close(conn);
+
+ plan->next = next;
+ plan->next_arg = arg;
+ plan->io = do_connect;
+
return plan;
}
-struct io_plan io_idle_(void)
+struct io_plan *io_wait_(struct io_conn *conn,
+ const void *wait,
+ struct io_plan *(*next)(struct io_conn *, void *),
+ void *arg)
{
- struct io_plan plan;
+ struct io_plan *plan;
+
+ /* If we're duplex, we want this on the current plan. Otherwise,
+ * doesn't matter. */
+ if (conn->plan[IO_IN].status == IO_UNSET)
+ plan = io_get_plan(conn, IO_IN);
+ else
+ plan = io_get_plan(conn, IO_OUT);
- plan.pollflag = 0;
- plan.io = NULL;
- /* Never called (overridden by io_wake), but NULL means closing */
- plan.next = (void *)io_idle_;
+ assert(next);
+
+ plan->next = next;
+ plan->next_arg = arg;
+ plan->u1.const_vp = wait;
+ plan->status = IO_WAITING;
return plan;
}
-void io_wake_(struct io_conn *conn, struct io_plan plan)
-
+void io_wake(const void *wait)
{
- io_plan_debug_again();
+ backend_wake(wait);
+}
- /* It might be closing, but we haven't called its finish() yet. */
- if (!conn->plan.next)
+static void do_plan(struct io_conn *conn, struct io_plan *plan)
+{
+ /* Someone else might have called io_close() on us. */
+ if (plan->status == IO_CLOSING)
return;
- /* It was idle, right? */
- assert(!conn->plan.io);
- conn->plan = plan;
- backend_plan_changed(conn);
- debug_io_wake(conn);
-}
+ /* We shouldn't have polled for this event if this wasn't true! */
+ assert(plan->status == IO_POLLING);
-void io_ready(struct io_conn *conn)
-{
- set_current(conn);
- switch (conn->plan.io(conn->fd.fd, &conn->plan)) {
- case -1: /* Failure means a new plan: close up. */
- conn->plan = io_close();
- backend_plan_changed(conn);
+ switch (plan->io(conn->fd.fd, plan)) {
+ case -1:
+ io_close(conn);
break;
- case 0: /* Keep going with plan. */
+ case 0:
break;
- case 1: /* Done: get next plan. */
- if (timeout_active(conn))
- backend_del_timeout(conn);
- conn->plan = conn->plan.next(conn, conn->plan.next_arg);
- backend_plan_changed(conn);
- }
- set_current(NULL);
-
- /* If it closed, close duplex. */
- if (!conn->plan.next && conn->duplex) {
- set_current(conn->duplex);
- conn->duplex->plan = io_close();
- backend_plan_changed(conn->duplex);
- set_current(NULL);
+ case 1:
+ next_plan(conn, plan);
+ break;
+ default:
+ /* IO should only return -1, 0 or 1 */
+ abort();
}
}
+void io_ready(struct io_conn *conn, int pollflags)
+{
+ if (pollflags & POLLIN)
+ do_plan(conn, &conn->plan[IO_IN]);
+
+ if (pollflags & POLLOUT)
+ do_plan(conn, &conn->plan[IO_OUT]);
+}
+
+void io_do_always(struct io_conn *conn)
+{
+ if (conn->plan[IO_IN].status == IO_ALWAYS)
+ next_plan(conn, &conn->plan[IO_IN]);
+
+ if (conn->plan[IO_OUT].status == IO_ALWAYS)
+ next_plan(conn, &conn->plan[IO_OUT]);
+}
+
+void io_do_wakeup(struct io_conn *conn, struct io_plan *plan)
+{
+ assert(plan->status == IO_WAITING);
+ next_plan(conn, plan);
+}
+
/* Close the connection, we're done. */
-struct io_plan io_close_(void)
+struct io_plan *io_close(struct io_conn *conn)
{
- struct io_plan plan;
+ /* Already closing? Don't close twice. */
+ if (conn->plan[IO_IN].status == IO_CLOSING)
+ return &conn->plan[IO_IN];
- plan.pollflag = 0;
- /* This means we're closing. */
- plan.next = NULL;
- plan.u1.s = errno;
+ conn->plan[IO_IN].status = conn->plan[IO_OUT].status = IO_CLOSING;
+ conn->plan[IO_IN].u1.s = errno;
+ backend_new_closing(conn);
- return plan;
+ return &conn->plan[IO_IN];
}
-struct io_plan io_close_cb(struct io_conn *conn, void *arg)
+struct io_plan *io_close_cb(struct io_conn *conn, void *arg)
{
- return io_close();
+ return io_close(conn);
}
/* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan io_break_(void *ret, struct io_plan plan)
+void io_break(const void *ret)
{
- io_plan_debug_again();
-
assert(ret);
- io_loop_return = ret;
+ io_loop_return = (void *)ret;
+}
- return plan;
+struct io_plan *io_never(struct io_conn *conn, void *unused)
+{
+ return io_always(conn, io_never_called, NULL);
}
int io_conn_fd(const struct io_conn *conn)
return conn->fd.fd;
}
-void io_set_alloc(void *(*allocfn)(size_t size),
- void *(*reallocfn)(void *ptr, size_t size),
- void (*freefn)(void *ptr))
+struct io_plan *io_duplex(struct io_plan *in_plan, struct io_plan *out_plan)
{
- io_alloc.alloc = allocfn;
- io_alloc.realloc = reallocfn;
- io_alloc.free = freefn;
+ /* in_plan must be conn->plan[IO_IN], out_plan must be [IO_OUT] */
+ assert(out_plan == in_plan + 1);
+
+ return out_plan + 1;
}