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

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 86db8c3d..714972d1 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,111 +2,88 @@
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
-#include <ccan/timer/timer.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;
 };
 
-
 /* 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,
-	NEXT, /* eg starting, woken from idle, return from io_break. */
-	IDLE,
-	FINISHED,
-	PROCESSING /* We expect them to change this now. */
-};
-
-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;
-};
+	const tal_t *ctx;
 
-struct io_state_readpart {
-	char *buf;
-	size_t *lenp;
+	/* These are for connections we create. */
+	struct io_plan *(*init)(struct io_conn *conn, void *arg);
+	void *arg;
 };
 
-struct io_state_writepart {
-	const char *buf;
-	size_t *lenp;
+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_timeout {
-	struct timer timer;
-	struct io_conn *conn;
-
-	struct io_plan *(*next)(struct io_conn *, void *arg);
+/**
+ * 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;
 
-	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;
-		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_set_state(struct io_conn *conn, struct io_plan *op);
-void backend_add_timeout(struct io_conn *conn, struct timespec ts);
-void backend_del_timeout(struct io_conn *conn);
-
-struct io_plan *do_ready(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 backend_plan_done(struct io_conn *conn);
+bool backend_set_exclusive(struct io_plan *plan, bool exclusive);
+
+void backend_wake(const void *wait);
+
+void io_ready(struct io_conn *conn, int pollflags);
+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 */