void *io_loop_return;
+struct io_plan io_conn_freed;
+
struct io_listener *io_new_listener_(const tal_t *ctx, int fd,
struct io_plan *(*init)(struct io_conn *,
void *),
void io_close_listener(struct io_listener *l)
{
- close(l->fd.fd);
- del_listener(l);
tal_free(l);
}
abort();
}
-static void next_plan(struct io_conn *conn, struct io_plan *plan)
+/* Returns false if conn was freed. */
+static bool next_plan(struct io_conn *conn, struct io_plan *plan)
{
struct io_plan *(*next)(struct io_conn *, void *arg);
plan = next(conn, plan->next_arg);
- /* 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]);
+ if (plan == &io_conn_freed)
+ return false;
+
+ assert(plan == &conn->plan[plan->dir]);
assert(conn->plan[IO_IN].status != IO_UNSET
|| conn->plan[IO_OUT].status != IO_UNSET);
backend_new_plan(conn);
+ return true;
}
-static void set_blocking(int fd, bool block)
+bool io_fd_block(int fd, bool block)
{
int flags = fcntl(fd, F_GETFL);
+ if (flags == -1)
+ return false;
+
if (block)
flags &= ~O_NONBLOCK;
else
flags |= O_NONBLOCK;
- fcntl(fd, F_SETFL, flags);
+ return fcntl(fd, F_SETFL, flags) != -1;
}
struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
conn->fd.fd = fd;
conn->finish = NULL;
conn->finish_arg = NULL;
- conn->list = NULL;
- conn->debug = false;
if (!add_conn(conn))
return tal_free(conn);
/* Keep our I/O async. */
- set_blocking(fd, false);
+ io_fd_block(fd, false);
+
+ /* So we can get back from plan -> conn later */
+ conn->plan[IO_OUT].dir = IO_OUT;
+ conn->plan[IO_IN].dir = IO_IN;
/* 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]);
+ if (!next_plan(conn, &conn->plan[IO_IN]))
+ return NULL;
return conn;
}
+bool io_conn_exclusive(struct io_conn *conn, bool exclusive)
+{
+ return backend_set_exclusive(&conn->plan[IO_IN], exclusive);
+}
+
+bool io_conn_out_exclusive(struct io_conn *conn, bool exclusive)
+{
+ return backend_set_exclusive(&conn->plan[IO_OUT], exclusive);
+}
+
void io_set_finish_(struct io_conn *conn,
void (*finish)(struct io_conn *, void *),
void *arg)
{
assert(conn->plan[dir].status == IO_UNSET);
- conn->plan[dir].status = IO_POLLING;
+ conn->plan[dir].status = IO_POLLING_NOTSTARTED;
return &conn->plan[dir].arg;
}
struct io_plan *plan = &conn->plan[dir];
plan->status = IO_ALWAYS;
- backend_new_always(conn);
+ /* Only happens on OOM, and only with non-default tal_backend. */
+ if (!backend_new_always(plan))
+ return NULL;
return io_set_plan(conn, dir, NULL, next, arg);
}
static int do_read(int fd, struct io_plan_arg *arg)
{
ssize_t ret = read(fd, arg->u1.cp, arg->u2.s);
- if (ret <= 0)
+ if (ret <= 0) {
+ /* Errno isn't set if we hit EOF, so set it to distinct value */
+ if (ret == 0)
+ errno = 0;
return -1;
+ }
arg->u1.cp += ret;
arg->u2.s -= ret;
static int do_read_partial(int fd, struct io_plan_arg *arg)
{
ssize_t ret = read(fd, arg->u1.cp, *(size_t *)arg->u2.vp);
- if (ret <= 0)
+ if (ret <= 0) {
+ /* Errno isn't set if we hit EOF, so set it to distinct value */
+ if (ret == 0)
+ errno = 0;
return -1;
+ }
*(size_t *)arg->u2.vp = ret;
return 1;
backend_wake(wait);
}
-static int do_plan(struct io_conn *conn, struct io_plan *plan)
+/* Returns false if this should not be touched (eg. freed). */
+static bool do_plan(struct io_conn *conn, struct io_plan *plan,
+ bool idle_on_epipe)
{
- /* Someone else might have called io_close() on us. */
- if (plan->status == IO_CLOSING)
- return -1;
-
/* We shouldn't have polled for this event if this wasn't true! */
- assert(plan->status == IO_POLLING);
+ assert(plan->status == IO_POLLING_NOTSTARTED
+ || plan->status == IO_POLLING_STARTED);
switch (plan->io(conn->fd.fd, &plan->arg)) {
case -1:
+ if (errno == EPIPE && idle_on_epipe) {
+ plan->status = IO_UNSET;
+ backend_new_plan(conn);
+ return false;
+ }
io_close(conn);
- return -1;
+ return false;
case 0:
- return 0;
+ plan->status = IO_POLLING_STARTED;
+ return true;
case 1:
- next_plan(conn, plan);
- return 1;
+ return next_plan(conn, plan);
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 (!do_plan(conn, &conn->plan[IO_IN], false))
+ return;
if (pollflags & POLLOUT)
- do_plan(conn, &conn->plan[IO_OUT]);
+ /* If we're writing to a closed pipe, we need to wait for
+ * read to fail if we're duplex: we want to drain it! */
+ do_plan(conn, &conn->plan[IO_OUT],
+ conn->plan[IO_IN].status == IO_POLLING_NOTSTARTED
+ || conn->plan[IO_IN].status == IO_POLLING_STARTED);
}
-void io_do_always(struct io_conn *conn)
+void io_do_always(struct io_plan *plan)
{
- if (conn->plan[IO_IN].status == IO_ALWAYS)
- next_plan(conn, &conn->plan[IO_IN]);
+ struct io_conn *conn;
- if (conn->plan[IO_OUT].status == IO_ALWAYS)
- next_plan(conn, &conn->plan[IO_OUT]);
+ assert(plan->status == IO_ALWAYS);
+ conn = container_of(plan, struct io_conn, plan[plan->dir]);
+
+ next_plan(conn, plan);
}
void io_do_wakeup(struct io_conn *conn, enum io_direction dir)
/* Close the connection, we're done. */
struct io_plan *io_close(struct io_conn *conn)
{
- /* Already closing? Don't close twice. */
- if (conn->plan[IO_IN].status == IO_CLOSING)
- return &conn->plan[IO_IN];
-
- conn->plan[IO_IN].status = conn->plan[IO_OUT].status = IO_CLOSING;
- conn->plan[IO_IN].arg.u1.s = errno;
- backend_new_closing(conn);
-
- return io_set_plan(conn, IO_IN, NULL, NULL, NULL);
+ tal_free(conn);
+ return &io_conn_freed;
}
struct io_plan *io_close_cb(struct io_conn *conn, void *next_arg)
return io_close(conn);
}
+struct io_plan *io_close_taken_fd(struct io_conn *conn)
+{
+ io_fd_block(conn->fd.fd, true);
+
+ cleanup_conn_without_close(conn);
+ return io_close(conn);
+}
+
/* Exit the loop, returning this (non-NULL) arg. */
void io_break(const void *ret)
{
return conn->fd.fd;
}
-void io_duplex_prepare(struct io_conn *conn)
-{
- assert(conn->plan[IO_IN].status == IO_UNSET);
- assert(conn->plan[IO_OUT].status == IO_UNSET);
-
- /* We can't sync debug until we've set both: io_wait() and io_always
- * can't handle it. */
- conn->debug_saved = conn->debug;
- io_set_debug(conn, false);
-}
-
-struct io_plan *io_duplex_(struct io_plan *in_plan, struct io_plan *out_plan)
+struct io_plan *io_duplex(struct io_conn *conn,
+ struct io_plan *in_plan, struct io_plan *out_plan)
{
- struct io_conn *conn;
-
+ assert(conn == container_of(in_plan, struct io_conn, plan[IO_IN]));
/* in_plan must be conn->plan[IO_IN], out_plan must be [IO_OUT] */
assert(out_plan == in_plan + 1);
-
- /* Restore debug. */
- conn = container_of(in_plan, struct io_conn, plan[IO_IN]);
- io_set_debug(conn, conn->debug_saved);
-
- /* Now set the plans again, to invoke sync debug. */
- io_set_plan(conn, IO_OUT,
- out_plan->io, out_plan->next, out_plan->next_arg);
- io_set_plan(conn, IO_IN,
- in_plan->io, in_plan->next, in_plan->next_arg);
-
- return out_plan + 1;
+ return in_plan;
}
struct io_plan *io_halfclose(struct io_conn *conn)
{
- /* Already closing? Don't close twice. */
- if (conn->plan[IO_IN].status == IO_CLOSING)
- return &conn->plan[IO_IN];
-
/* Both unset? OK. */
if (conn->plan[IO_IN].status == IO_UNSET
&& conn->plan[IO_OUT].status == IO_UNSET)
plan->io = io;
plan->next = next;
plan->next_arg = next_arg;
- assert(plan->status == IO_CLOSING || next != NULL);
-
- if (!conn->debug)
- return plan;
-
- if (io_loop_return) {
- io_debug_complete(conn);
- return plan;
- }
-
- switch (plan->status) {
- case IO_POLLING:
- while (do_plan(conn, plan) == 0);
- break;
- /* Shouldn't happen, since you said you did plan! */
- case IO_UNSET:
- abort();
- case IO_ALWAYS:
- /* If other one is ALWAYS, leave in list! */
- if (conn->plan[!dir].status != IO_ALWAYS)
- remove_from_always(conn);
- next_plan(conn, plan);
- break;
- case IO_WAITING:
- case IO_CLOSING:
- io_debug_complete(conn);
- }
+ assert(next != NULL);
return plan;
}
-void io_set_debug(struct io_conn *conn, bool debug)
+bool io_plan_in_started(const struct io_conn *conn)
{
- conn->debug = debug;
+ return conn->plan[IO_IN].status == IO_POLLING_STARTED;
+}
- /* Debugging means fds must block. */
- set_blocking(io_conn_fd(conn), debug);
+bool io_plan_out_started(const struct io_conn *conn)
+{
+ return conn->plan[IO_OUT].status == IO_POLLING_STARTED;
}
-void io_debug_complete(struct io_conn *conn)
+bool io_flush_sync(struct io_conn *conn)
{
+ struct io_plan *plan = &conn->plan[IO_OUT];
+ bool ok;
+
+ /* Not writing? Nothing to do. */
+ if (plan->status != IO_POLLING_STARTED
+ && plan->status != IO_POLLING_NOTSTARTED)
+ return true;
+
+ /* Synchronous please. */
+ io_fd_block(io_conn_fd(conn), true);
+
+again:
+ switch (plan->io(conn->fd.fd, &plan->arg)) {
+ case -1:
+ ok = false;
+ break;
+ /* Incomplete, try again. */
+ case 0:
+ plan->status = IO_POLLING_STARTED;
+ goto again;
+ case 1:
+ ok = true;
+ /* In case they come back. */
+ set_always(conn, IO_OUT, plan->next, plan->next_arg);
+ break;
+ default:
+ /* IO should only return -1, 0 or 1 */
+ abort();
+ }
+
+ io_fd_block(io_conn_fd(conn), false);
+ return ok;
}