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->fd.next = start;
- l->fd.finish = finish;
- l->fd.finish_arg = l->fd.next_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->fd.next = start;
- conn->fd.finish = finish;
- conn->fd.finish_arg = conn->fd.next_arg = arg;
- conn->pollflag = 0;
- conn->state = NEXT;
+ conn->plan = plan;
+ conn->finish = finish;
+ 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->fd.next = start;
- conn->fd.finish = finish;
- conn->fd.finish_arg = conn->fd.next_arg = arg;
- conn->pollflag = 0;
- conn->state = NEXT;
+ conn->plan = plan;
conn->duplex = old;
+ conn->finish = finish;
+ conn->finish_arg = arg;
conn->timeout = NULL;
if (!add_duplex(conn)) {
free(conn);
return conn;
}
-static inline struct io_plan *to_ioplan(enum io_state state)
-{
- return (struct io_plan *)(long)state;
-}
-
bool io_timeout_(struct io_conn *conn, struct timespec ts,
- struct io_plan *(*cb)(struct io_conn *, void *), void *arg)
+ struct io_plan (*cb)(struct io_conn *, void *), void *arg)
{
if (!conn->timeout) {
conn->timeout = malloc(sizeof(*conn->timeout));
return true;
}
+static enum io_result do_write(struct io_conn *conn)
+{
+ 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;
+}
+
/* Queue some data to be written. */
-struct io_plan *io_write_(struct io_conn *conn, const void *data, size_t len,
- struct io_plan *(*cb)(struct io_conn *, void *),
- void *arg)
+struct io_plan io_write_(const void *data, size_t len,
+ struct io_plan (*cb)(struct io_conn *, void *),
+ void *arg)
+{
+ struct io_plan plan;
+
+ 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)
{
- conn->u.write.buf = data;
- conn->u.write.len = len;
- conn->fd.next = cb;
- conn->fd.next_arg = arg;
- conn->pollflag = POLLOUT;
- return to_ioplan(WRITE);
+ 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;
}
/* Queue a request to read into a buffer. */
-struct io_plan *io_read_(struct io_conn *conn, void *data, size_t len,
- struct io_plan *(*cb)(struct io_conn *, void *),
- void *arg)
+struct io_plan io_read_(void *data, size_t len,
+ struct io_plan (*cb)(struct io_conn *, void *),
+ void *arg)
{
- conn->u.read.buf = data;
- conn->u.read.len = len;
- conn->fd.next = cb;
- conn->fd.next_arg = arg;
- conn->pollflag = POLLIN;
- return to_ioplan(READ);
+ struct io_plan plan;
+
+ 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)
+{
+ 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;
}
/* Queue a partial request to read into a buffer. */
-struct io_plan *io_read_partial_(struct io_conn *conn, void *data, size_t *len,
- struct io_plan *(*cb)(struct io_conn *, void *),
- void *arg)
+struct io_plan io_read_partial_(void *data, size_t *len,
+ struct io_plan (*cb)(struct io_conn *, void *),
+ void *arg)
{
- conn->u.readpart.buf = data;
- conn->u.readpart.lenp = len;
- conn->fd.next = cb;
- conn->fd.next_arg = arg;
- conn->pollflag = POLLIN;
- return to_ioplan(READPART);
+ struct io_plan plan;
+
+ 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)
+{
+ 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;
}
/* Queue a partial write request. */
-struct io_plan *io_write_partial_(struct io_conn *conn,
- const void *data, size_t *len,
- struct io_plan *(*cb)(struct io_conn*, void *),
- void *arg)
+struct io_plan io_write_partial_(const void *data, size_t *len,
+ struct io_plan (*cb)(struct io_conn*, void *),
+ void *arg)
{
- conn->u.writepart.buf = data;
- conn->u.writepart.lenp = len;
- conn->fd.next = cb;
- conn->fd.next_arg = arg;
- conn->pollflag = POLLOUT;
- return to_ioplan(WRITEPART);
+ struct io_plan plan;
+
+ 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 *io_idle(struct io_conn *conn)
+struct io_plan io_idle(void)
{
- conn->pollflag = 0;
- return to_ioplan(IDLE);
+ struct io_plan plan;
+
+ plan.pollflag = 0;
+ plan.state = IO_IO;
+ plan.io = NULL;
+
+ 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->state == FINISHED)
+ if (conn->plan.state == IO_FINISHED)
return;
- assert(conn->state == IDLE);
- conn->fd.next = fn;
- conn->fd.next_arg = arg;
- backend_set_state(conn, to_ioplan(NEXT));
+ assert(!conn->plan.io);
+ conn->plan = plan;
+ backend_wakeup(conn);
}
-static struct io_plan *do_next(struct io_conn *conn)
+static struct io_plan do_next(struct io_conn *conn)
{
if (timeout_active(conn))
backend_del_timeout(conn);
- return conn->fd.next(conn, conn->fd.next_arg);
+ return conn->plan.next(conn, conn->plan.next_arg);
}
-struct io_plan *do_ready(struct io_conn *conn)
+struct io_plan do_ready(struct io_conn *conn)
{
- ssize_t ret;
- bool finished;
-
- switch (conn->state) {
- case WRITE:
- ret = write(conn->fd.fd, conn->u.write.buf, conn->u.write.len);
- if (ret < 0)
- return io_close(conn, NULL);
- conn->u.write.buf += ret;
- conn->u.write.len -= ret;
- finished = (conn->u.write.len == 0);
- break;
- case WRITEPART:
- ret = write(conn->fd.fd, conn->u.writepart.buf,
- *conn->u.writepart.lenp);
- if (ret < 0)
- return io_close(conn, NULL);
- *conn->u.writepart.lenp = ret;
- finished = true;
- break;
- case READ:
- ret = read(conn->fd.fd, conn->u.read.buf, conn->u.read.len);
- if (ret <= 0)
- return io_close(conn, NULL);
- conn->u.read.buf += ret;
- conn->u.read.len -= ret;
- finished = (conn->u.read.len == 0);
- break;
- case READPART:
- ret = read(conn->fd.fd, conn->u.readpart.buf,
- *conn->u.readpart.lenp);
- if (ret <= 0)
- return io_close(conn, NULL);
- *conn->u.readpart.lenp = ret;
- finished = true;
- break;
+ 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:
- /* Shouldn't happen. */
abort();
}
-
- if (finished)
- return do_next(conn);
- return to_ioplan(conn->state);
}
/* 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(struct io_conn *conn, void *arg)
{
- return to_ioplan(FINISHED);
+ struct io_plan plan;
+
+ plan.state = IO_FINISHED;
+ plan.pollflag = 0;
+
+ return plan;
}
/* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan *io_break_(struct io_conn *conn, void *ret,
- struct io_plan *(*fn)(struct io_conn *, void *),
- void *arg)
+struct io_plan io_break(void *ret, struct io_plan plan)
{
io_loop_return = ret;
- conn->fd.next = fn;
- conn->fd.next_arg = arg;
- return to_ioplan(NEXT);
+ return plan;
}
projects / ccan / blobdiff