void *io_loop_return;
+#ifdef DEBUG
+bool io_plan_for_other;
+struct io_conn *current;
+bool (*io_debug)(struct io_conn *conn);
+bool io_debug_wakeup;
+
+void io_plan_debug(struct io_plan *plan)
+{
+ if (io_plan_for_other) {
+ io_plan_for_other = false;
+ return;
+ }
+
+ if (!io_debug || !current)
+ return;
+
+ if (!io_debug(current) && !io_debug_wakeup)
+ return;
+
+ io_debug_wakeup = false;
+ current->plan = *plan;
+ backend_plan_changed(current);
+
+ /* Call back into the loop immediately. */
+ io_loop_return = io_loop();
+}
+
+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))
+ io_debug_wakeup = true;
+}
+#else
+static void debug_io_wake(struct io_conn *conn)
+{
+}
+#endif
+
struct io_listener *io_new_listener_(int fd,
void (*init)(int fd, void *arg),
void *arg)
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);
return true;
}
-static enum io_result do_write(struct io_conn *conn)
+/* Returns true if we're finished. */
+static int do_write(int fd, struct io_plan *plan)
{
- ssize_t ret = write(conn->fd.fd, conn->plan.u.write.buf, conn->plan.u.write.len);
+ ssize_t ret = write(fd, plan->u.write.buf, plan->u.write.len);
if (ret < 0)
- return RESULT_CLOSE;
-
- conn->plan.u.write.buf += ret;
- conn->plan.u.write.len -= ret;
- if (conn->plan.u.write.len == 0)
- return RESULT_FINISHED;
- else
- return RESULT_AGAIN;
+ return -1;
+
+ plan->u.write.buf += ret;
+ plan->u.write.len -= ret;
+ return (plan->u.write.len == 0);
}
/* Queue some data to be written. */
plan.next = cb;
plan.next_arg = arg;
plan.pollflag = POLLOUT;
+
+ io_plan_debug(&plan);
return plan;
}
-static enum io_result do_read(struct io_conn *conn)
+static int do_read(int fd, struct io_plan *plan)
{
- ssize_t ret = read(conn->fd.fd, conn->plan.u.read.buf,
- conn->plan.u.read.len);
+ ssize_t ret = read(fd, plan->u.read.buf, plan->u.read.len);
if (ret <= 0)
- return RESULT_CLOSE;
- conn->plan.u.read.buf += ret;
- conn->plan.u.read.len -= ret;
- if (conn->plan.u.read.len == 0)
- return RESULT_FINISHED;
- else
- return RESULT_AGAIN;
+ return -1;
+
+ plan->u.read.buf += ret;
+ plan->u.read.len -= ret;
+ return (plan->u.read.len == 0);
}
/* Queue a request to read into a buffer. */
plan.next = cb;
plan.next_arg = arg;
plan.pollflag = POLLIN;
+
+ io_plan_debug(&plan);
return plan;
}
-static enum io_result do_read_partial(struct io_conn *conn)
+static int do_read_partial(int fd, struct io_plan *plan)
{
- ssize_t ret = read(conn->fd.fd, conn->plan.u.readpart.buf,
- *conn->plan.u.readpart.lenp);
+ ssize_t ret = read(fd, plan->u.readpart.buf, *plan->u.readpart.lenp);
if (ret <= 0)
- return RESULT_CLOSE;
- *conn->plan.u.readpart.lenp = ret;
- return RESULT_FINISHED;
+ return -1;
+
+ *plan->u.readpart.lenp = ret;
+ 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 enum io_result do_write_partial(struct io_conn *conn)
+static int do_write_partial(int fd, struct io_plan *plan)
{
- ssize_t ret = write(conn->fd.fd, conn->plan.u.writepart.buf,
- *conn->plan.u.writepart.lenp);
+ ssize_t ret = write(fd, plan->u.writepart.buf, *plan->u.writepart.lenp);
if (ret < 0)
- return RESULT_CLOSE;
- *conn->plan.u.writepart.lenp = ret;
- return RESULT_FINISHED;
+ return -1;
+
+ *plan->u.writepart.lenp = ret;
+ return 1;
}
/* Queue a partial write request. */
plan.next_arg = arg;
plan.pollflag = POLLOUT;
+ 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;
+ io_plan_debug(&plan);
return plan;
}
-void io_wake(struct io_conn *conn, struct io_plan plan)
+void io_wake_(struct io_conn *conn, struct io_plan plan)
{
/* It might be closing, but we haven't called its finish() yet. */
/* It was idle, right? */
assert(!conn->plan.io);
conn->plan = plan;
- backend_wakeup(conn);
-}
+ backend_plan_changed(conn);
-static struct io_plan do_next(struct io_conn *conn)
-{
- if (timeout_active(conn))
- backend_del_timeout(conn);
- return conn->plan.next(conn, conn->plan.next_arg);
+ debug_io_wake(conn);
}
-struct io_plan do_ready(struct io_conn *conn)
+void io_ready(struct io_conn *conn)
{
- switch (conn->plan.io(conn)) {
- case RESULT_CLOSE:
- return io_close(conn, NULL);
- case RESULT_FINISHED:
- return do_next(conn);
- case RESULT_AGAIN:
- return conn->plan;
- default:
- abort();
+ 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);
+ conn->plan = conn->plan.next(conn, conn->plan.next_arg);
+ backend_plan_changed(conn);
+ set_current(NULL);
}
}
-/* 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)
+struct io_plan io_break_(void *ret, struct io_plan plan)
{
assert(ret);
io_loop_return = ret;
projects / ccan / blobdiff