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 bc88c289b7bf412d8d12d46497e1f375616a8e72..86db8c3d1de44983e3061bb33699a7783d69c88d 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -21,15 +21,14 @@ struct io_listener {
        void *conn_arg;
 };
 
-enum io_state {
-       /* These wait for something to input */
-       READ,
-       READPART,
-
-       /* 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,
@@ -82,6 +81,8 @@ struct io_conn {
        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 {