X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fbackend.h;h=765e920ea9158d149eead5e5bb5d371d2d6f4531;hp=3c5b3f8b781bb38ab014fee995b9272ad4164c28;hb=42762758d98feb08b861361b7f695de2cad26b07;hpb=7a8a585c32d1010426f587a6933f05de7a06dfd0

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 3c5b3f8b..765e920e 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -8,33 +8,30 @@ 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;
+
+	/* These are for connections we create. */
+	struct io_plan *(*next)(struct io_conn *, void *arg);
+	void (*finish)(struct io_conn *, void *arg);
+	void *conn_arg;
+};
+
+enum io_result {
+	RESULT_AGAIN,
+	RESULT_FINISHED,
+	RESULT_CLOSE
 };
 
 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. */
+	IO_IO,
+	IO_NEXT, /* eg starting, woken from idle, return from io_break. */
+	IO_IDLE,
+	IO_FINISHED
 };
 
 static inline enum io_state from_ioplan(struct io_plan *op)
@@ -74,9 +71,18 @@ struct io_timeout {
 struct io_conn {
 	struct fd fd;
 
+	struct io_plan *(*next)(struct io_conn *, void *arg);
+	void *next_arg;
+
+	void (*finish)(struct io_conn *, void *arg);
+	void *finish_arg;
+
 	struct io_conn *duplex;
 	struct io_timeout *timeout;
 
+	enum io_result (*io)(struct io_conn *conn);
+
+	int pollflag; /* 0, POLLIN or POLLOUT */
 	enum io_state state;
 	union {
 		struct io_state_read read;
@@ -97,7 +103,7 @@ 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_wakeup(struct io_conn *conn);
 void backend_add_timeout(struct io_conn *conn, struct timespec ts);
 void backend_del_timeout(struct io_conn *conn);