ccan/io: rename io_op to io_plan.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 06427eb6fa37ea53aabfb47725211e8a448756b8..3c5b3f8b781bb38ab014fee995b9272ad4164c28 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -1,14 +1,15 @@
-/* Licensed under BSD-MIT - see LICENSE file for details */
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
+#include <ccan/timer/timer.h>
 
 struct fd {
        int fd;
        bool listener;
        size_t backend_info;
 
-       struct io_op *(*next)(struct io_conn *, void *arg);
+       struct io_plan *(*next)(struct io_conn *, void *arg);
        void *next_arg;
 
        void (*finish)(struct io_conn *, void *arg);
@@ -22,17 +23,21 @@ struct io_listener {
 };
 
 enum io_state {
-       NEXT, /* eg starting, woken from idle, return from io_break. */
+       /* These wait for something to input */
        READ,
-       WRITE,
        READPART,
+
+       /* These wait for room to output */
+       WRITE,
        WRITEPART,
+
+       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;
 }
@@ -57,10 +62,21 @@ struct io_state_writepart {
        size_t *lenp;
 };
 
+struct io_timeout {
+       struct timer timer;
+       struct io_conn *conn;
+
+       struct io_plan *(*next)(struct io_conn *, void *arg);
+       void *next_arg;
+};
+
 /* One connection per client. */
 struct io_conn {
        struct fd fd;
 
+       struct io_conn *duplex;
+       struct io_timeout *timeout;
+
        enum io_state state;
        union {
                struct io_state_read read;
@@ -70,13 +86,20 @@ struct io_conn {
        } u;
 };
 
+static inline bool timeout_active(const struct io_conn *conn)
+{
+       return conn->timeout && conn->timeout->conn;
+}
+
 extern void *io_loop_return;
 
 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_writeable(struct io_conn *conn);
-struct io_op *do_readable(struct io_conn *conn);
+struct io_plan *do_ready(struct io_conn *conn);
 #endif /* CCAN_IO_BACKEND_H */