#include <errno.h>
#include <stdlib.h>
#include <assert.h>
+#include <poll.h>
void *io_loop_return;
struct io_listener *io_new_listener_(int fd,
- struct io_op *(*start)(struct io_conn *,
- void *arg),
+ struct io_plan *(*start)(struct io_conn *,
+ void *arg),
void (*finish)(struct io_conn *, void *),
void *arg)
{
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->next = start;
+ l->finish = finish;
+ l->conn_arg = arg;
if (!add_listener(l)) {
free(l);
return NULL;
}
struct io_conn *io_new_conn_(int fd,
- struct io_op *(*start)(struct io_conn *, void *),
+ struct io_plan *(*start)(struct io_conn *, void *),
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->next = start;
+ conn->finish = finish;
+ conn->finish_arg = conn->next_arg = arg;
+ conn->pollflag = 0;
conn->state = NEXT;
conn->duplex = NULL;
conn->timeout = NULL;
}
struct io_conn *io_duplex_(struct io_conn *old,
- struct io_op *(*start)(struct io_conn *, void *),
+ struct io_plan *(*start)(struct io_conn *, void *),
void (*finish)(struct io_conn *, void *),
void *arg)
{
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->next = start;
+ conn->finish = finish;
+ conn->finish_arg = conn->next_arg = arg;
+ conn->pollflag = 0;
conn->state = NEXT;
conn->duplex = old;
conn->timeout = NULL;
return conn;
}
-/* Convenient token which only we can produce. */
-static inline struct io_next *to_ionext(struct io_conn *conn)
+static inline struct io_plan *to_ioplan(enum io_state state)
{
- return (struct io_next *)conn;
-}
-
-static inline struct io_op *to_ioop(enum io_state state)
-{
- return (struct io_op *)(long)state;
-}
-
-static inline struct io_conn *from_ionext(struct io_next *next)
-{
- return (struct io_conn *)next;
-}
-
-struct io_next *io_next_(struct io_conn *conn,
- struct io_op *(*next)(struct io_conn *, void *),
- void *arg)
-{
- conn->fd.next = next;
- conn->fd.next_arg = arg;
-
- return to_ionext(conn);
+ return (struct io_plan *)(long)state;
}
bool io_timeout_(struct io_conn *conn, struct timespec ts,
- struct io_op *(*next)(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));
} else
assert(!timeout_active(conn));
- conn->timeout->next = next;
+ conn->timeout->next = cb;
conn->timeout->next_arg = arg;
backend_add_timeout(conn, ts);
return true;
}
/* Queue some data to be written. */
-struct io_op *io_write(const void *data, size_t len, struct io_next *next)
+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_conn *conn = from_ionext(next);
conn->u.write.buf = data;
conn->u.write.len = len;
- return to_ioop(WRITE);
+ conn->next = cb;
+ conn->next_arg = arg;
+ conn->pollflag = POLLOUT;
+ return to_ioplan(WRITE);
}
/* Queue a request to read into a buffer. */
-struct io_op *io_read(void *data, size_t len, struct io_next *next)
+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_conn *conn = from_ionext(next);
conn->u.read.buf = data;
conn->u.read.len = len;
- return to_ioop(READ);
+ conn->next = cb;
+ conn->next_arg = arg;
+ conn->pollflag = POLLIN;
+ return to_ioplan(READ);
}
/* Queue a partial request to read into a buffer. */
-struct io_op *io_read_partial(void *data, size_t *len, struct io_next *next)
+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_conn *conn = from_ionext(next);
conn->u.readpart.buf = data;
conn->u.readpart.lenp = len;
- return to_ioop(READPART);
+ conn->next = cb;
+ conn->next_arg = arg;
+ conn->pollflag = POLLIN;
+ return to_ioplan(READPART);
}
/* Queue a partial write request. */
-struct io_op *io_write_partial(const void *data, size_t *len, struct io_next *next)
+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_conn *conn = from_ionext(next);
conn->u.writepart.buf = data;
conn->u.writepart.lenp = len;
- return to_ioop(WRITEPART);
+ conn->next = cb;
+ conn->next_arg = arg;
+ conn->pollflag = POLLOUT;
+ return to_ioplan(WRITEPART);
}
-struct io_op *io_idle(struct io_conn *conn)
+struct io_plan *io_idle(struct io_conn *conn)
{
- return to_ioop(IDLE);
+ conn->pollflag = 0;
+ return to_ioplan(IDLE);
}
void io_wake_(struct io_conn *conn,
- struct io_op *(*next)(struct io_conn *, void *), void *arg)
+ struct io_plan *(*fn)(struct io_conn *, void *), void *arg)
{
/* It might have finished, but we haven't called its finish() yet. */
if (conn->state == FINISHED)
return;
assert(conn->state == IDLE);
- conn->fd.next = next;
- conn->fd.next_arg = arg;
- backend_set_state(conn, to_ioop(NEXT));
+ conn->next = fn;
+ conn->next_arg = arg;
+ backend_set_state(conn, to_ioplan(NEXT));
}
-static struct io_op *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->next(conn, conn->next_arg);
}
-struct io_op *do_ready(struct io_conn *conn)
+struct io_plan *do_ready(struct io_conn *conn)
{
ssize_t ret;
bool finished;
if (finished)
return do_next(conn);
- return to_ioop(conn->state);
+ return to_ioplan(conn->state);
}
/* Useful next functions. */
/* Close the connection, we're done. */
-struct io_op *io_close(struct io_conn *conn, void *arg)
+struct io_plan *io_close(struct io_conn *conn, void *arg)
{
- return to_ioop(FINISHED);
+ return to_ioplan(FINISHED);
}
/* Exit the loop, returning this (non-NULL) arg. */
-struct io_op *io_break(void *arg, struct io_next *next)
+struct io_plan *io_break_(struct io_conn *conn, void *ret,
+ struct io_plan *(*fn)(struct io_conn *, void *),
+ void *arg)
{
- io_loop_return = arg;
+ io_loop_return = ret;
+ conn->next = fn;
+ conn->next_arg = arg;
- return to_ioop(NEXT);
+ return to_ioplan(NEXT);
}
projects / ccan / blobdiff