X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fbackend.h;h=c071c5d6c5939372bcbb290a0a580e5257076e38;hp=44e64ab165583765cea22a5e08a374eaf5c7dfdc;hb=1966714494a5de39b2ee944fcc01f333c1741dbd;hpb=cdffdf5d61f8330cfc3467e73a84876eb3928e9b

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 44e64ab1..c071c5d6 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,8 +2,8 @@
 #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>
 
 struct fd {
 	int fd;
@@ -22,12 +22,46 @@ struct io_listener {
 	void *arg;
 };
 
+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_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;
 
-	/* always or closing list. */
-	struct io_conn *list;
+	/* always list. */
+	struct list_node always;
 
 	void (*finish)(struct io_conn *, void *arg);
 	void *finish_arg;
@@ -41,17 +75,16 @@ 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 cleanup_conn_without_close(struct io_conn *c);
 void backend_new_always(struct io_conn *conn);
 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_wakeup(struct io_conn *conn, struct io_plan *plan);
+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 */