X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fbackend.h;h=2ee5a830e1233bd614d916d73d7087a9f9ec7cea;hb=8e6c2fecfd633171250b7f09ef4aa0328bd5b698;hp=aace0f2bad38d96a6835da31a2a2edf9f020ea6a;hpb=96dcdfbf1a400f7cb43cf3f0761f52fd6de9ff65;p=ccan

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index aace0f2b..2ee5a830 100644
--- 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,14 +25,13 @@ 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
 };
 
 /**
@@ -60,8 +58,8 @@ struct io_plan {
 struct io_conn {
 	struct fd fd;
 
-	/* always and closing lists. */
-	struct list_node always, closing;
+	/* always list. */
+	struct list_node always;
 
 	void (*finish)(struct io_conn *, void *arg);
 	void *finish_arg;
@@ -75,14 +73,13 @@ 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);