X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Fio.c;h=faf8b87bfd649b7244e8ee01087651d1039dbbf5;hp=f45589c0fac71888b1be312debcb3ec04597b0bb;hb=95b59482c1bb18b7904ea60149eff4809dd28d80;hpb=96a1ebd3354ef6250e94b509b4e0c0f1ea7e67bb;ds=sidebyside

diff --git a/ccan/io/io.c b/ccan/io/io.c
index f45589c0..faf8b87b 100644
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -94,6 +94,10 @@ int io_debug_io(int ret)
 	case 1: /* Done: get next plan. */
 		if (timeout_active(conn))
 			backend_del_timeout(conn);
+		/* In case they call io_duplex, clear our poll flags so
+		 * both sides don't seem to be both doing read or write
+		 * (See	assert(!mask || pfd->events != mask) in poll.c) */
+		conn->plan.pollflag = 0;
 		conn->plan.next(conn, conn->plan.next_arg);
 		break;
 	default:
@@ -408,6 +412,11 @@ struct io_plan io_idle_(void)
 	return plan;
 }
 
+bool io_is_idle(const struct io_conn *conn)
+{
+	return conn->plan.io == NULL;
+}
+
 void io_wake_(struct io_conn *conn, struct io_plan plan)
 
 {
@@ -426,6 +435,10 @@ void io_wake_(struct io_conn *conn, struct io_plan plan)
 
 void io_ready(struct io_conn *conn)
 {
+	/* Beware io_close_other! */
+	if (!conn->plan.next)
+		return;
+
 	set_current(conn);
 	switch (conn->plan.io(conn->fd.fd, &conn->plan)) {
 	case -1: /* Failure means a new plan: close up. */
@@ -437,6 +450,10 @@ void io_ready(struct io_conn *conn)
 	case 1: /* Done: get next plan. */
 		if (timeout_active(conn))
 			backend_del_timeout(conn);
+		/* In case they call io_duplex, clear our poll flags so
+		 * both sides don't seem to be both doing read or write
+		 * (See	assert(!mask || pfd->events != mask) in poll.c) */
+		conn->plan.pollflag = 0;
 		conn->plan = conn->plan.next(conn, conn->plan.next_arg);
 		backend_plan_changed(conn);
 	}
@@ -461,6 +478,12 @@ struct io_plan io_close_cb(struct io_conn *conn, void *arg)
 	return io_close();
 }
 
+void io_close_other(struct io_conn *conn)
+{
+	conn->plan = io_close_();
+	backend_plan_changed(conn);
+}
+
 /* Exit the loop, returning this (non-NULL) arg. */
 struct io_plan io_break_(void *ret, struct io_plan plan)
 {