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

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 765e920e..44e64ab1 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,7 +2,8 @@
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
-#include <ccan/timer/timer.h>
+#include <poll.h>
+#include "io_plan.h"
 
 struct fd {
 	int fd;
@@ -10,102 +11,47 @@ struct fd {
 	size_t backend_info;
 };
 
-
 /* 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 {
-	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)
-{
-	return (enum io_state)(long)op;
-}
-
-struct io_state_read {
-	char *buf;
-	size_t len;
-};
-
-struct io_state_write {
-	const char *buf;
-	size_t len;
-};
-
-struct io_state_readpart {
-	char *buf;
-	size_t *lenp;
-};
-
-struct io_state_writepart {
-	const char *buf;
-	size_t *lenp;
-};
-
-struct io_timeout {
-	struct timer timer;
-	struct io_conn *conn;
+	const tal_t *ctx;
 
-	struct io_plan *(*next)(struct io_conn *, void *arg);
-	void *next_arg;
+	/* These are for connections we create. */
+	struct io_plan *(*init)(struct io_conn *conn, void *arg);
+	void *arg;
 };
 
 /* One connection per client. */
 struct io_conn {
 	struct fd fd;
 
-	struct io_plan *(*next)(struct io_conn *, void *arg);
-	void *next_arg;
+	/* always or closing list. */
+	struct io_conn *list;
 
 	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;
-		struct io_state_write write;
-		struct io_state_readpart readpart;
-		struct io_state_writepart writepart;
-	} u;
+	struct io_plan plan[2];
 };
 
-static inline bool timeout_active(const struct io_conn *conn)
-{
-	return conn->timeout && conn->timeout->conn;
-}
-
 extern void *io_loop_return;
 
 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_wakeup(struct io_conn *conn);
-void backend_add_timeout(struct io_conn *conn, struct timespec ts);
-void backend_del_timeout(struct io_conn *conn);
+void backend_new_closing(struct io_conn *conn);
+void backend_new_always(struct io_conn *conn);
+void backend_new_plan(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);
 
-struct io_plan *do_ready(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 *do_io_loop(struct io_conn **ready);
 #endif /* CCAN_IO_BACKEND_H */