X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fbackend.h;h=e65c990683669d8cae1ee67a4fa3c540201a1764;hb=f6f11f6b06bde2c1d5ce0f744998f07c6bce4546;hp=2b41fa72864ca1df0ac16b2afa023e2cfcd1856c;hpb=a2dffefa5ef8d0cf71d99755c4640a8004679b1d;p=ccan

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 2b41fa72..e65c9906 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -1,88 +1,59 @@
-/* Licensed under BSD-MIT - see LICENSE file for details */
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
+#include <ccan/timer/timer.h>
 
 struct fd {
 	int fd;
 	bool listener;
 	size_t backend_info;
-
-	struct io_op *(*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;
-};
-
-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. */
-};
-
-static inline enum io_state from_ioop(struct io_op *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;
+	/* These are for connections we create. */
+	void (*init)(int fd, void *arg);
+	void *arg;
 };
 
-struct io_state_readpart {
-	char *buf;
-	size_t *lenp;
-};
+struct io_timeout {
+	struct timer timer;
+	struct io_conn *conn;
 
-struct io_state_writepart {
-	const char *buf;
-	size_t *lenp;
+	struct io_plan (*next)(struct io_conn *, void *arg);
+	void *next_arg;
 };
 
 /* One connection per client. */
 struct io_conn {
 	struct fd fd;
 
+	void (*finish)(struct io_conn *, void *arg);
+	void *finish_arg;
+
 	struct io_conn *duplex;
+	struct io_timeout *timeout;
 
-	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;
 };
 
+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_op *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);
 
-struct io_op *do_ready(struct io_conn *conn);
+struct io_plan do_ready(struct io_conn *conn);
 #endif /* CCAN_IO_BACKEND_H */