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 3a1f12e7ee859742b0341912de41044c5416b61b..d877e44e1580cd66f8646b8abb414dc157abfb0a 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,7 +2,6 @@
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
-#include <poll.h>
 #include "io_plan.h"
 #include <ccan/list/list.h>
 
@@ -26,19 +25,19 @@ struct io_listener {
 enum io_plan_status {
        /* As before calling next function. */
        IO_UNSET,
-       /* Normal. */
-       IO_POLLING,
+       /* Normal, but haven't started yet. */
+       IO_POLLING_NOTSTARTED,
+       IO_POLLING_STARTED,
        /* Waiting for io_wake */
        IO_WAITING,
        /* Always do this. */
-       IO_ALWAYS,
-       /* Closing (both plans will be the same). */
-       IO_CLOSING
+       IO_ALWAYS
 };
 
 /**
  * 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.
@@ -47,6 +46,7 @@ enum io_plan_status {
  */
 struct io_plan {
        enum io_plan_status status;
+       enum io_direction dir;
 
        int (*io)(int fd, struct io_plan_arg *arg);
 
@@ -59,12 +59,6 @@ struct io_plan {
 /* One connection per client. */
 struct io_conn {
        struct fd fd;
-       bool debug;
-       /* For duplex to save. */
-       bool debug_saved;
-
-       /* always and closing lists. */
-       struct list_node always, closing;
 
        void (*finish)(struct io_conn *, void *arg);
        void *finish_arg;
@@ -78,17 +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_new_closing(struct io_conn *conn);
-void backend_new_always(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 remove_from_always(struct io_conn *conn);
 void backend_plan_done(struct io_conn *conn);
 
 void backend_wake(const void *wait);
-void backend_del_conn(struct io_conn *conn);
 
 void io_ready(struct io_conn *conn, int pollflags);
-void io_do_always(struct io_conn *conn);
+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 */