ccan/io: use explicit IO callback functions, instead of io_state values.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index a36dee9b1a727c5dc0658fd7d418884b4eccb29d..86db8c3d1de44983e3061bb33699a7783d69c88d 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -8,36 +8,34 @@ struct fd {
        int fd;
        bool listener;
        size_t backend_info;
-
-       struct io_op *(*next)(struct io_conn *, void *arg);
-       void *next_arg;
-
-       void (*finish)(struct io_conn *, void *arg);
-       void *finish_arg;
 };
 
 
 /* Listeners create connections. */
 struct io_listener {
        struct fd fd;
-};
 
-enum io_state {
-       /* These wait for something to input */
-       READ,
-       READPART,
+       /* These are for connections we create. */
+       struct io_plan *(*next)(struct io_conn *, void *arg);
+       void (*finish)(struct io_conn *, void *arg);
+       void *conn_arg;
+};
 
-       /* These wait for room to output */
-       WRITE,
-       WRITEPART,
+enum io_result {
+       RESULT_AGAIN,
+       RESULT_FINISHED,
+       RESULT_CLOSE
+};
 
+enum io_state {
+       IO,
        NEXT, /* eg starting, woken from idle, return from io_break. */
        IDLE,
        FINISHED,
        PROCESSING /* We expect them to change this now. */
 };
 
-static inline enum io_state from_ioop(struct io_op *op)
+static inline enum io_state from_ioplan(struct io_plan *op)
 {
        return (enum io_state)(long)op;
 }
@@ -66,7 +64,7 @@ struct io_timeout {
        struct timer timer;
        struct io_conn *conn;
 
-       struct io_op *(*next)(struct io_conn *, void *arg);
+       struct io_plan *(*next)(struct io_conn *, void *arg);
        void *next_arg;
 };
 
@@ -74,9 +72,18 @@ struct io_timeout {
 struct io_conn {
        struct fd fd;
 
+       struct io_plan *(*next)(struct io_conn *, void *arg);
+       void *next_arg;
+
+       void (*finish)(struct io_conn *, void *arg);
+       void *finish_arg;
+
        struct io_conn *duplex;
        struct io_timeout *timeout;
 
+       enum io_result (*io)(struct io_conn *conn);
+
+       int pollflag; /* 0, POLLIN or POLLOUT */
        enum io_state state;
        union {
                struct io_state_read read;
@@ -97,9 +104,9 @@ bool add_listener(struct io_listener *l);
 bool add_conn(struct io_conn *c);
 bool add_duplex(struct io_conn *c);
 void del_listener(struct io_listener *l);
-void backend_set_state(struct io_conn *conn, struct io_op *op);
+void backend_set_state(struct io_conn *conn, struct io_plan *op);
 void backend_add_timeout(struct io_conn *conn, struct timespec ts);
 void backend_del_timeout(struct io_conn *conn);
 
-struct io_op *do_ready(struct io_conn *conn);
+struct io_plan *do_ready(struct io_conn *conn);
 #endif /* CCAN_IO_BACKEND_H */