X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fbackend.h;h=e2090ff14068ebe0a34317941bb8efc6f7cb9a0a;hb=d218dcd458cbec7a1b958af39b70cd068da7b040;hp=c03ce2dc5f07e2709fa59744f2d0774d2f608551;hpb=625bae8f5720d3ad3253ea9b26ad68abcd81bde5;p=ccan

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index c03ce2dc..e2090ff1 100644
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -3,6 +3,17 @@
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
 #include <ccan/timer/timer.h>
+#include <poll.h>
+
+/* A setting for actions to always run (eg. zero-length reads). */
+#define POLLALWAYS (((POLLIN|POLLOUT) + 1) & ~((POLLIN|POLLOUT)))
+
+struct io_alloc {
+	void *(*alloc)(size_t size);
+	void *(*realloc)(void *ptr, size_t size);
+	void (*free)(void *ptr);
+};
+extern struct io_alloc io_alloc;
 
 struct fd {
 	int fd;
@@ -15,9 +26,8 @@ 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;
+	void (*init)(int fd, void *arg);
+	void *arg;
 };
 
 struct io_timeout {
@@ -48,13 +58,43 @@ static inline bool timeout_active(const struct io_conn *conn)
 
 extern void *io_loop_return;
 
+#ifdef DEBUG
+extern struct io_conn *current;
+static inline void set_current(struct io_conn *conn)
+{
+	current = conn;
+}
+static inline bool doing_debug_on(struct io_conn *conn)
+{
+	return io_debug_conn && io_debug_conn(conn);
+}
+static inline bool doing_debug(void)
+{
+	return io_debug_conn;
+}
+#else
+static inline void set_current(struct io_conn *conn)
+{
+}
+static inline bool doing_debug_on(struct io_conn *conn)
+{
+	return false;
+}
+static inline bool doing_debug(void)
+{
+	return false;
+}
+#endif
+
 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_plan_changed(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_del_conn(struct io_conn *conn);
 
-struct io_plan do_ready(struct io_conn *conn);
+void io_ready(struct io_conn *conn);
+void *do_io_loop(struct io_conn **ready);
 #endif /* CCAN_IO_BACKEND_H */