X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.h;h=b8bf643dd6abe76a73a59ee56e1a4b25bb98bed1;hp=5bbe42a4ab38648d826bc08fce9f137f7b97e00c;hb=34776d3e9ad7de78778306a2d09c2c95df06c902;hpb=f6f11f6b06bde2c1d5ce0f744998f07c6bce4546

diff --git a/ccan/io/io.h b/ccan/io/io.h
index 5bbe42a4..b8bf643d 100644
--- a/ccan/io/io.h
+++ b/ccan/io/io.h
@@ -8,6 +8,14 @@
 
 struct io_conn;
 
+#ifdef DEBUG
+extern bool io_plan_for_other;
+extern bool (*io_debug)(struct io_conn *conn);
+#define io_plan_other() ((io_plan_for_other = true))
+#else
+#define io_plan_other() (void)0
+#endif
+
 struct io_state_read {
 	char *buf;
 	size_t len;
@@ -28,18 +36,6 @@ struct io_state_writepart {
 	size_t *lenp;
 };
 
-enum io_result {
-	RESULT_AGAIN,
-	RESULT_FINISHED,
-	RESULT_CLOSE
-};
-
-enum io_state {
-	IO_IO,
-	IO_IDLE,
-	IO_FINISHED
-};
-
 /**
  * struct io_plan - returned from a setup function.
  *
@@ -47,8 +43,9 @@ enum io_state {
  */
 struct io_plan {
 	int pollflag;
-	enum io_state state;
-	enum io_result (*io)(struct io_conn *conn);
+	/* Only NULL if idle. */
+	bool (*io)(int fd, struct io_plan *plan);
+	/* Only NULL if closing. */
 	struct io_plan (*next)(struct io_conn *, void *arg);
 	void *next_arg;
 
@@ -74,10 +71,11 @@ struct io_plan {
  * Returns NULL on error (and sets errno).
  */
 #define io_new_conn(fd, plan, finish, arg)				\
-	io_new_conn_((fd), (plan),					\
-		     typesafe_cb_preargs(void, void *, (finish), (arg),	\
-					 struct io_conn *),		\
-		     (arg))
+	(io_plan_other(), io_new_conn_((fd), (plan),			\
+				       typesafe_cb_preargs(void, void *, \
+							   (finish), (arg), \
+							   struct io_conn *), \
+				       (arg)))
 struct io_conn *io_new_conn_(int fd,
 			     struct io_plan plan,
 			     void (*finish)(struct io_conn *, void *),
@@ -248,10 +246,11 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
  * You must io_close() both of them to close the fd.
  */
 #define io_duplex(conn, plan, finish, arg)				\
-	io_duplex_((conn), (plan),					\
-		   typesafe_cb_preargs(void, void *, (finish), (arg),	\
-				       struct io_conn *),		\
-		   (arg))
+	(io_plan_other(), io_duplex_((conn), (plan),			\
+				     typesafe_cb_preargs(void, void *,	\
+							 (finish), (arg), \
+							 struct io_conn *), \
+				     (arg)))
 
 struct io_conn *io_duplex_(struct io_conn *conn,
 			   struct io_plan plan,
@@ -265,7 +264,8 @@ struct io_conn *io_duplex_(struct io_conn *conn,
  *
  * This makes @conn do I/O the next time around the io_loop().
  */
-void io_wake(struct io_conn *conn, struct io_plan plan);
+#define io_wake(conn, plan) (io_plan_other(), io_wake_((conn), (plan)))
+void io_wake_(struct io_conn *conn, struct io_plan plan);
 
 /**
  * io_break - return from io_loop()
@@ -278,7 +278,8 @@ void io_wake(struct io_conn *conn, struct io_plan plan);
  *
  * If io_loop() is called again, then @plan will be carried out.
  */
-struct io_plan io_break(void *ret, struct io_plan plan);
+#define io_break(ret, plan) (io_plan_other(), io_break_((ret), (plan)))
+struct io_plan io_break_(void *ret, struct io_plan plan);
 
 /* FIXME: io_recvfrom/io_sendto */