void *io_loop_return;
struct io_listener *io_new_listener_(int fd,
- struct io_plan (*start)(struct io_conn *,
- void *arg),
- void (*finish)(struct io_conn *, void *),
+ void (*init)(int fd, void *arg),
void *arg)
{
struct io_listener *l = malloc(sizeof(*l));
l->fd.listener = true;
l->fd.fd = fd;
- l->next = start;
- l->finish = finish;
- l->conn_arg = arg;
+ l->init = init;
+ l->arg = arg;
if (!add_listener(l)) {
free(l);
return NULL;
}
struct io_conn *io_new_conn_(int fd,
- struct io_plan (*start)(struct io_conn *, void *),
+ struct io_plan plan,
void (*finish)(struct io_conn *, void *),
void *arg)
{
conn->fd.listener = false;
conn->fd.fd = fd;
- conn->plan.next = start;
+ conn->plan = plan;
conn->finish = finish;
- conn->finish_arg = conn->plan.next_arg = arg;
- conn->plan.pollflag = 0;
- conn->plan.state = IO_NEXT;
+ conn->finish_arg = arg;
conn->duplex = NULL;
conn->timeout = NULL;
if (!add_conn(conn)) {
}
struct io_conn *io_duplex_(struct io_conn *old,
- struct io_plan (*start)(struct io_conn *, void *),
- void (*finish)(struct io_conn *, void *),
- void *arg)
+ struct io_plan plan,
+ void (*finish)(struct io_conn *, void *),
+ void *arg)
{
struct io_conn *conn;
conn->fd.listener = false;
conn->fd.fd = old->fd.fd;
- conn->plan.next = start;
- conn->finish = finish;
- conn->finish_arg = conn->plan.next_arg = arg;
- conn->plan.pollflag = 0;
- conn->plan.state = IO_NEXT;
+ conn->plan = plan;
conn->duplex = old;
+ conn->finish = finish;
+ conn->finish_arg = arg;
conn->timeout = NULL;
if (!add_duplex(conn)) {
free(conn);
bool io_timeout_(struct io_conn *conn, struct timespec ts,
struct io_plan (*cb)(struct io_conn *, void *), void *arg)
{
+ assert(cb);
+
if (!conn->timeout) {
conn->timeout = malloc(sizeof(*conn->timeout));
if (!conn->timeout)
return true;
}
-static enum io_result do_write(struct io_conn *conn)
+/* Returns true if we're finished. */
+static bool 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);
- 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;
+ 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;
+ }
+
+ plan->u.write.buf += ret;
+ plan->u.write.len -= ret;
+ return (plan->u.write.len == 0);
}
/* Queue some data to be written. */
{
struct io_plan plan;
+ assert(cb);
plan.u.write.buf = data;
plan.u.write.len = len;
plan.io = do_write;
plan.next = cb;
plan.next_arg = arg;
plan.pollflag = POLLOUT;
- plan.state = IO_IO;
return plan;
}
-static enum io_result do_read(struct io_conn *conn)
+static bool 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);
- 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;
+ 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;
+ }
+
+ plan->u.read.buf += ret;
+ plan->u.read.len -= ret;
+ return (plan->u.read.len == 0);
}
/* Queue a request to read into a buffer. */
{
struct io_plan plan;
+ assert(cb);
plan.u.read.buf = data;
plan.u.read.len = len;
plan.io = do_read;
plan.next = cb;
plan.next_arg = arg;
plan.pollflag = POLLIN;
- plan.state = IO_IO;
return plan;
}
-static enum io_result do_read_partial(struct io_conn *conn)
+static bool 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);
- if (ret <= 0)
- return RESULT_CLOSE;
- *conn->plan.u.readpart.lenp = ret;
- return RESULT_FINISHED;
+ 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;
+ }
+
+ *plan->u.readpart.lenp = ret;
+ return true;
}
/* Queue a partial request to read into a buffer. */
{
struct io_plan plan;
+ assert(cb);
plan.u.readpart.buf = data;
plan.u.readpart.lenp = len;
plan.io = do_read_partial;
plan.next = cb;
plan.next_arg = arg;
plan.pollflag = POLLIN;
- plan.state = IO_IO;
return plan;
}
-static enum io_result do_write_partial(struct io_conn *conn)
+static bool 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);
- if (ret < 0)
- return RESULT_CLOSE;
- *conn->plan.u.writepart.lenp = ret;
- return RESULT_FINISHED;
+ 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;
+ }
+
+ *plan->u.writepart.lenp = ret;
+ return true;
}
/* Queue a partial write request. */
{
struct io_plan plan;
+ assert(cb);
plan.u.writepart.buf = data;
plan.u.writepart.lenp = len;
plan.io = do_write_partial;
plan.next = cb;
plan.next_arg = arg;
plan.pollflag = POLLOUT;
- plan.state = IO_IO;
return plan;
}
struct io_plan plan;
plan.pollflag = 0;
- plan.state = IO_IDLE;
+ plan.io = NULL;
+ /* Never called (overridded by io_wake), but NULL means closing */
+ plan.next = io_close;
return plan;
}
-void io_wake_(struct io_conn *conn,
- struct io_plan (*fn)(struct io_conn *, void *), void *arg)
+void io_wake(struct io_conn *conn, struct io_plan plan)
{
- /* It might have finished, but we haven't called its finish() yet. */
- if (conn->plan.state == IO_FINISHED)
+ /* It might be closing, but we haven't called its finish() yet. */
+ if (!conn->plan.next)
return;
- assert(conn->plan.state == IO_IDLE);
- conn->plan.next = fn;
- conn->plan.next_arg = arg;
- conn->plan.pollflag = 0;
- conn->plan.state = IO_NEXT;
- backend_wakeup(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);
+ /* It was idle, right? */
+ assert(!conn->plan.io);
+ conn->plan = plan;
+ backend_plan_changed(conn);
}
-struct io_plan do_ready(struct io_conn *conn)
+void io_ready(struct io_conn *conn)
{
- assert(conn->plan.state == IO_IO);
- 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();
+ if (conn->plan.io(conn->fd.fd, &conn->plan)) {
+ if (timeout_active(conn))
+ backend_del_timeout(conn);
+ conn->plan = conn->plan.next(conn, conn->plan.next_arg);
+ backend_plan_changed(conn);
}
}
{
struct io_plan plan;
- plan.state = IO_FINISHED;
plan.pollflag = 0;
+ /* This means we're closing. */
+ plan.next = NULL;
return plan;
}
/* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan io_break_(void *ret,
- struct io_plan (*fn)(struct io_conn *, void *),
- void *arg)
+struct io_plan io_break(void *ret, struct io_plan plan)
{
- struct io_plan plan;
-
+ assert(ret);
io_loop_return = ret;
- plan.state = IO_NEXT;
- plan.pollflag = 0;
- plan.next = fn;
- plan.next_arg = arg;
-
return plan;
}