ccan/io: keep always pointers to plans, not a linked list.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 2eb333091c187b4c39dc5ade4e4e7d84ee6054c2..d877e44e1580cd66f8646b8abb414dc157abfb0a 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,95 +2,69 @@
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
-#include <ccan/timer/timer.h>
+#include "io_plan.h"
+#include <ccan/list/list.h>
 
 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 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_ioplan(struct io_plan *op)
-{
-       return (enum io_state)(long)op;
-}
+       const tal_t *ctx;
 
-struct io_state_read {
-       char *buf;
-       size_t len;
+       /* These are for connections we create. */
+       struct io_plan *(*init)(struct io_conn *conn, void *arg);
+       void *arg;
 };
 
-struct io_state_write {
-       const char *buf;
-       size_t len;
+enum io_plan_status {
+       /* As before calling next function. */
+       IO_UNSET,
+       /* Normal, but haven't started yet. */
+       IO_POLLING_NOTSTARTED,
+       IO_POLLING_STARTED,
+       /* Waiting for io_wake */
+       IO_WAITING,
+       /* Always do this. */
+       IO_ALWAYS
 };
 
-struct io_state_readpart {
-       char *buf;
-       size_t *lenp;
-};
-
-struct io_state_writepart {
-       const char *buf;
-       size_t *lenp;
-};
-
-struct io_timeout {
-       struct timer timer;
-       struct io_conn *conn;
-
-       struct io_plan *(*next)(struct io_conn *, void *arg);
+/**
+ * struct io_plan - one half of I/O to do
+ * @status: the status of this plan.
+ * @dir: are we plan[0] or plan[1] inside io_conn?
+ * @io: function to call when fd becomes read/writable, returns 0 to be
+ *      called again, 1 if it's finished, and -1 on error (fd will be closed)
+ * @next: the next function which is called if io returns 1.
+ * @next_arg: the argument to @next
+ * @u1, @u2: scratch space for @io.
+ */
+struct io_plan {
+       enum io_plan_status status;
+       enum io_direction dir;
+
+       int (*io)(int fd, struct io_plan_arg *arg);
+
+       struct io_plan *(*next)(struct io_conn *, void *next_arg);
        void *next_arg;
+
+       struct io_plan_arg arg;
 };
 
 /* One connection per client. */
 struct io_conn {
        struct fd fd;
 
-       struct io_conn *duplex;
-       struct io_timeout *timeout;
-
-       int pollflag; /* 0, POLLIN or POLLOUT */
-       enum io_state state;
-       union {
-               struct io_state_read read;
-               struct io_state_write write;
-               struct io_state_readpart readpart;
-               struct io_state_writepart writepart;
-       } u;
-};
+       void (*finish)(struct io_conn *, void *arg);
+       void *finish_arg;
 
-static inline bool timeout_active(const struct io_conn *conn)
-{
-       return conn->timeout && conn->timeout->conn;
-}
+       struct io_plan plan[2];
+};
 
 extern void *io_loop_return;
 
@@ -98,9 +72,15 @@ 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_plan *op);
-void backend_add_timeout(struct io_conn *conn, struct timespec ts);
-void backend_del_timeout(struct io_conn *conn);
+void cleanup_conn_without_close(struct io_conn *c);
+bool backend_new_always(struct io_plan *plan);
+void backend_new_plan(struct io_conn *conn);
+void backend_plan_done(struct io_conn *conn);
+
+void backend_wake(const void *wait);
 
-struct io_plan *do_ready(struct io_conn *conn);
+void io_ready(struct io_conn *conn, int pollflags);
+void io_do_always(struct io_plan *conn);
+void io_do_wakeup(struct io_conn *conn, enum io_direction dir);
+void *do_io_loop(struct io_conn **ready);
 #endif /* CCAN_IO_BACKEND_H */