bool (*io_debug)(struct io_conn *conn);
bool io_debug_wakeup;
-static void debug_io_plan(struct io_plan *plan)
+void io_plan_debug(struct io_plan *plan)
{
if (io_plan_for_other) {
io_plan_for_other = false;
io_debug_wakeup = true;
}
#else
-static void debug_io_plan(struct io_plan *plan)
-{
-}
static void debug_io_wake(struct io_conn *conn)
{
}
free(l);
}
-struct io_conn *io_new_conn_(int fd,
- struct io_plan plan,
- void (*finish)(struct io_conn *, void *),
- void *arg)
+struct io_conn *io_new_conn_(int fd, struct io_plan plan)
{
struct io_conn *conn = malloc(sizeof(*conn));
conn->fd.listener = false;
conn->fd.fd = fd;
conn->plan = plan;
- conn->finish = finish;
- conn->finish_arg = arg;
+ conn->finish = NULL;
+ conn->finish_arg = NULL;
conn->duplex = NULL;
conn->timeout = NULL;
if (!add_conn(conn)) {
return conn;
}
-struct io_conn *io_duplex_(struct io_conn *old,
- struct io_plan plan,
- void (*finish)(struct io_conn *, void *),
- void *arg)
+void io_set_finish_(struct io_conn *conn,
+ void (*finish)(struct io_conn *, void *),
+ void *arg)
+{
+ conn->finish = finish;
+ conn->finish_arg = arg;
+}
+
+struct io_conn *io_duplex_(struct io_conn *old, struct io_plan plan)
{
struct io_conn *conn;
conn->fd.fd = old->fd.fd;
conn->plan = plan;
conn->duplex = old;
- conn->finish = finish;
- conn->finish_arg = arg;
+ conn->finish = NULL;
+ conn->finish_arg = NULL;
conn->timeout = NULL;
if (!add_duplex(conn)) {
free(conn);
}
/* Returns true if we're finished. */
-static bool do_write(int fd, struct io_plan *plan)
+static int do_write(int fd, struct io_plan *plan)
{
ssize_t ret = write(fd, plan->u.write.buf, plan->u.write.len);
- if (ret < 0) {
- /* Override next function to close us. */
- plan->next = io_close;
- return true;
- }
+ if (ret < 0)
+ return -1;
plan->u.write.buf += ret;
plan->u.write.len -= ret;
plan.next_arg = arg;
plan.pollflag = POLLOUT;
- debug_io_plan(&plan);
+ io_plan_debug(&plan);
return plan;
}
-static bool do_read(int fd, struct io_plan *plan)
+static int do_read(int fd, struct io_plan *plan)
{
ssize_t ret = read(fd, plan->u.read.buf, plan->u.read.len);
- if (ret <= 0) {
- /* Override next function to close us. */
- plan->next = io_close;
- return true;
- }
+ if (ret <= 0)
+ return -1;
plan->u.read.buf += ret;
plan->u.read.len -= ret;
plan.next_arg = arg;
plan.pollflag = POLLIN;
- debug_io_plan(&plan);
+ io_plan_debug(&plan);
return plan;
}
-static bool do_read_partial(int fd, struct io_plan *plan)
+static int do_read_partial(int fd, struct io_plan *plan)
{
ssize_t ret = read(fd, plan->u.readpart.buf, *plan->u.readpart.lenp);
- if (ret <= 0) {
- /* Override next function to close us. */
- plan->next = io_close;
- return true;
- }
+ if (ret <= 0)
+ return -1;
*plan->u.readpart.lenp = ret;
- return true;
+ return 1;
}
/* Queue a partial request to read into a buffer. */
plan.next_arg = arg;
plan.pollflag = POLLIN;
- debug_io_plan(&plan);
+ io_plan_debug(&plan);
return plan;
}
-static bool do_write_partial(int fd, struct io_plan *plan)
+static int do_write_partial(int fd, struct io_plan *plan)
{
ssize_t ret = write(fd, plan->u.writepart.buf, *plan->u.writepart.lenp);
- if (ret < 0) {
- /* Override next function to close us. */
- plan->next = io_close;
- return true;
- }
+ if (ret < 0)
+ return -1;
*plan->u.writepart.lenp = ret;
- return true;
+ return 1;
}
/* Queue a partial write request. */
plan.next_arg = arg;
plan.pollflag = POLLOUT;
- debug_io_plan(&plan);
+ io_plan_debug(&plan);
return plan;
}
plan.pollflag = 0;
plan.io = NULL;
- /* Never called (overridded by io_wake), but NULL means closing */
- plan.next = io_close;
+ /* Never called (overridden by io_wake), but NULL means closing */
+ plan.next = (void *)io_idle;
- debug_io_plan(&plan);
+ io_plan_debug(&plan);
return plan;
}
void io_ready(struct io_conn *conn)
{
- if (conn->plan.io(conn->fd.fd, &conn->plan)) {
+ switch (conn->plan.io(conn->fd.fd, &conn->plan)) {
+ case -1: /* Failure means a new plan: close up. */
+ set_current(conn);
+ conn->plan = io_close();
+ backend_plan_changed(conn);
+ set_current(NULL);
+ break;
+ case 0: /* Keep going with plan. */
+ break;
+ case 1: /* Done: get next plan. */
set_current(conn);
if (timeout_active(conn))
backend_del_timeout(conn);
}
}
-/* Useful next functions. */
/* Close the connection, we're done. */
-struct io_plan io_close(struct io_conn *conn, void *arg)
+struct io_plan io_close(void)
{
struct io_plan plan;
plan.pollflag = 0;
/* This means we're closing. */
plan.next = NULL;
+ plan.u.close.saved_errno = errno;
- debug_io_plan(&plan);
+ io_plan_debug(&plan);
return plan;
}
+struct io_plan io_close_cb(struct io_conn *conn, void *arg)
+{
+ return io_close();
+}
+
/* Exit the loop, returning this (non-NULL) arg. */
struct io_plan io_break_(void *ret, struct io_plan plan)
{