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 3c5b3f8b781bb38ab014fee995b9272ad4164c28..86db8c3d1de44983e3061bb33699a7783d69c88d 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -8,29 +8,27 @@ struct fd {
        int fd;
        bool listener;
        size_t backend_info;
-
-       struct io_plan *(*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,
@@ -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;