ccan/io users don't expect to deal with callbacks inside each other; we should
just mark woken connections as if they were io_always.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
void io_ready(struct io_conn *conn, int pollflags);
void io_do_always(struct io_conn *conn);
void io_ready(struct io_conn *conn, int pollflags);
void io_do_always(struct io_conn *conn);
-void io_do_wakeup(struct io_conn *conn, struct io_plan *plan);
+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 */
void *do_io_loop(struct io_conn **ready);
#endif /* CCAN_IO_BACKEND_H */
next_plan(conn, &conn->plan[IO_OUT]);
}
next_plan(conn, &conn->plan[IO_OUT]);
}
-void io_do_wakeup(struct io_conn *conn, struct io_plan *plan)
+void io_do_wakeup(struct io_conn *conn, enum io_direction dir)
+ struct io_plan *plan = &conn->plan[dir];
+
assert(plan->status == IO_WAITING);
assert(plan->status == IO_WAITING);
+
+ set_always(conn, dir, plan->next, plan->next_arg);
}
/* Close the connection, we're done. */
}
/* Close the connection, we're done. */
c = (void *)fds[i];
if (c->plan[IO_IN].status == IO_WAITING
&& c->plan[IO_IN].arg.u1.const_vp == wait)
c = (void *)fds[i];
if (c->plan[IO_IN].status == IO_WAITING
&& c->plan[IO_IN].arg.u1.const_vp == wait)
- io_do_wakeup(c, &c->plan[IO_IN]);
+ io_do_wakeup(c, IO_IN);
if (c->plan[IO_OUT].status == IO_WAITING
&& c->plan[IO_OUT].arg.u1.const_vp == wait)
if (c->plan[IO_OUT].status == IO_WAITING
&& c->plan[IO_OUT].arg.u1.const_vp == wait)
- io_do_wakeup(c, &c->plan[IO_OUT]);
+ io_do_wakeup(c, IO_OUT);