X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fbackend.h;h=714972d15ea4a3edfc6967ef22a00663c5f5eada;hp=2c03a98a1a4632917ad810f6e1d74d37813d52df;hb=580457bd3e4af60d5367412589d2aa1bb0289eed;hpb=43185ec669720903fa86aac5f2d1b1ee62e3a12b

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 2c03a98a..714972d1 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,12 +2,14 @@
 #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;
 	bool listener;
+	/* We could put these in io_plan, but they pack nicely here */
+	bool exclusive[2];
 	size_t backend_info;
 };
 
@@ -25,19 +27,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.
@@ -46,6 +48,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);
 
@@ -58,12 +61,6 @@ struct io_plan {
 /* One connection per client. */
 struct io_conn {
 	struct fd fd;
-	bool debug;
-	/* For duplex to save. */
-	bool debug_saved;
-
-	/* always or closing list. */
-	struct io_conn *list;
 
 	void (*finish)(struct io_conn *, void *arg);
 	void *finish_arg;
@@ -77,17 +74,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 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);
+bool backend_set_exclusive(struct io_plan *plan, bool exclusive);
 
 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_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 */