ccan/io: remove next & finish from union.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 2b41fa72864ca1df0ac16b2afa023e2cfcd1856c..bc88c289b7bf412d8d12d46497e1f375616a8e72 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -1,24 +1,24 @@
-/* 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);
-       void *next_arg;
-
-       void (*finish)(struct io_conn *, void *arg);
-       void *finish_arg;
 };
 
 
 /* Listeners create connections. */
 struct io_listener {
        struct fd fd;
+
+       /* 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;
 };
 
 enum io_state {
@@ -36,7 +36,7 @@ enum io_state {
        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;
 }
@@ -61,12 +61,28 @@ 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_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;
 
+       int pollflag; /* 0, POLLIN or POLLOUT */
        enum io_state state;
        union {
                struct io_state_read read;
@@ -76,13 +92,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_ready(struct io_conn *conn);
+struct io_plan *do_ready(struct io_conn *conn);
 #endif /* CCAN_IO_BACKEND_H */