ccan/io: remove next & finish from union.

[ccan] / ccan / io / io.c

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 210e55876bf083c354a6ce8c4436f14149782920..150f7269a4428b9890319481dfb93532971304ba 100644 (file)
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <poll.h>
 
 void *io_loop_return;
 
@@ -24,9 +25,9 @@ struct io_listener *io_new_listener_(int fd,
 
        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;
@@ -53,9 +54,10 @@ struct io_conn *io_new_conn_(int fd,
 
        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;
@@ -81,9 +83,10 @@ struct io_conn *io_duplex_(struct io_conn *old,
 
        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;
@@ -95,34 +98,13 @@ struct io_conn *io_duplex_(struct io_conn *old,
        return conn;
 }
 
-/* Convenient token which only we can produce. */
-static inline struct io_next *to_ionext(struct io_conn *conn)
-{
-       return (struct io_next *)conn;
-}
-
 static inline struct io_plan *to_ioplan(enum io_state state)
 {
        return (struct io_plan *)(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_plan *(*next)(struct io_conn *, void *),
-                        void *arg)
-{
-       conn->fd.next = next;
-       conn->fd.next_arg = arg;
-
-       return to_ionext(conn);
-}
-
 bool io_timeout_(struct io_conn *conn, struct timespec ts,
-                struct io_plan *(*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));
@@ -131,63 +113,81 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
        } 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_plan *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;
+       conn->next = cb;
+       conn->next_arg = arg;
+       conn->pollflag = POLLOUT;
        return to_ioplan(WRITE);
 }
 
 /* Queue a request to read into a buffer. */
-struct io_plan *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;
+       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_plan *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;
+       conn->next = cb;
+       conn->next_arg = arg;
+       conn->pollflag = POLLIN;
        return to_ioplan(READPART);
 }
 
 /* Queue a partial write request. */
-struct io_plan *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;
+       conn->next = cb;
+       conn->next_arg = arg;
+       conn->pollflag = POLLOUT;
        return to_ioplan(WRITEPART);
 }
 
 struct io_plan *io_idle(struct io_conn *conn)
 {
+       conn->pollflag = 0;
        return to_ioplan(IDLE);
 }
 
 void io_wake_(struct io_conn *conn,
-             struct io_plan *(*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;
+       conn->next = fn;
+       conn->next_arg = arg;
        backend_set_state(conn, to_ioplan(NEXT));
 }
 
@@ -195,7 +195,7 @@ 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_plan *do_ready(struct io_conn *conn)
@@ -254,9 +254,13 @@ struct io_plan *io_close(struct io_conn *conn, void *arg)
 }
 
 /* Exit the loop, returning this (non-NULL) arg. */
-struct io_plan *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_ioplan(NEXT);
 }