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,
return tal_free(conn);
/* Keep our I/O async. */
- set_blocking(fd, false);
+ io_fd_block(fd, false);
/* We start with out doing nothing, and in doing our init. */
conn->plan[IO_OUT].status = IO_UNSET;
{
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;
}
backend_wake(wait);
}
-/* Returns false if this has been freed. */
-static bool 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)
{
/* 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 false;
case 0:
+ plan->status = IO_POLLING_STARTED;
return true;
case 1:
return next_plan(conn, plan);
void io_ready(struct io_conn *conn, int pollflags)
{
if (pollflags & POLLIN)
- if (!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)
{
+ /* There's a corner case where the in next_plan wakes up the
+ * out, placing it in IO_ALWAYS and we end up processing it immediately,
+ * only to leave it in the always list.
+ *
+ * Yet we can't just process one, in case they are both supposed
+ * to be done, so grab state beforehand.
+ */
+ bool always_out = (conn->plan[IO_OUT].status == IO_ALWAYS);
+
if (conn->plan[IO_IN].status == IO_ALWAYS)
if (!next_plan(conn, &conn->plan[IO_IN]))
return;
- if (conn->plan[IO_OUT].status == IO_ALWAYS)
+ if (always_out) {
+ /* You can't *unalways* a conn (except by freeing, in which
+ * case next_plan() returned false */
+ assert(conn->plan[IO_OUT].status == IO_ALWAYS);
next_plan(conn, &conn->plan[IO_OUT]);
+ }
}
void io_do_wakeup(struct io_conn *conn, enum io_direction dir)
struct io_plan *io_close_taken_fd(struct io_conn *conn)
{
- set_blocking(conn->fd.fd, true);
+ io_fd_block(conn->fd.fd, true);
cleanup_conn_without_close(conn);
return io_close(conn);
return plan;
}
+
+bool io_plan_in_started(const struct io_conn *conn)
+{
+ return conn->plan[IO_IN].status == IO_POLLING_STARTED;
+}
+
+bool io_plan_out_started(const struct io_conn *conn)
+{
+ return conn->plan[IO_OUT].status == IO_POLLING_STARTED;
+}
+
+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;
+}