void *io_loop_return;
#ifdef DEBUG
-bool io_plan_for_other;
+/* Set to skip the next plan. */
+bool io_plan_nodebug;
+/* The current connection to apply plan to. */
struct io_conn *current;
-bool (*io_debug)(struct io_conn *conn);
+/* 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;
-void io_plan_debug(struct io_plan *plan)
+struct io_plan io_debug(struct io_plan plan)
{
- if (io_plan_for_other) {
- io_plan_for_other = false;
- return;
+ if (io_plan_nodebug) {
+ io_plan_nodebug = false;
+ return plan;
}
- if (!io_debug || !current)
- return;
+ if (!io_debug_conn || !current)
+ return plan;
- if (!io_debug(current) && !io_debug_wakeup)
- return;
+ if (!io_debug_conn(current) && !io_debug_wakeup)
+ return plan;
io_debug_wakeup = false;
- current->plan = *plan;
+ current->plan = plan;
backend_plan_changed(current);
/* Call back into the loop immediately. */
io_loop_return = io_loop();
+ return plan;
}
static void debug_io_wake(struct io_conn *conn)
{
/* We want linear if we wake a debugged connection, too. */
- if (io_debug && io_debug(conn))
+ 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,
{
struct io_conn *conn = malloc(sizeof(*conn));
+ io_plan_debug_again();
+
if (!conn)
return NULL;
{
struct io_conn *conn;
+ io_plan_debug_again();
+
assert(!old->duplex);
conn = malloc(sizeof(*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;
- 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;
- 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;
- 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;
- io_plan_debug(&plan);
return plan;
}
-struct io_plan io_idle(void)
+struct io_plan io_idle_(void)
{
struct io_plan 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_;
- io_plan_debug(&plan);
return plan;
}
void io_wake_(struct io_conn *conn, struct io_plan plan)
{
+ io_plan_debug_again();
+
/* It might be closing, but we haven't called its finish() yet. */
if (!conn->plan.next)
return;
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;
- 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)
{
+ io_plan_debug_again();
+
assert(ret);
io_loop_return = ret;