ccan/io: remove next & finish from union.

[ccan] / ccan / io / benchmarks / run-different-speed.c

diff --git a/ccan/io/benchmarks/run-different-speed.c b/ccan/io/benchmarks/run-different-speed.c
index e21b1dd9a1da96356f45f8488069bed165879124..10fa0b96ea2d1011a6e9d941ba76c5cedf194e61 100644 (file)
--- a/ccan/io/benchmarks/run-different-speed.c
+++ b/ccan/io/benchmarks/run-different-speed.c
@@ -25,24 +25,24 @@ struct client {
        char reply_buffer[REPLY_SIZE];
 };
 
-static struct io_op *write_reply(struct io_conn *conn, struct client *client);
-static struct io_op *read_request(struct io_conn *conn, struct client *client)
+static struct io_plan *write_reply(struct io_conn *conn, struct client *client);
+static struct io_plan *read_request(struct io_conn *conn, struct client *client)
 {
-       return io_read(client->request_buffer, REQUEST_SIZE,
-                      io_next(conn, write_reply, client));
+       return io_read(conn, client->request_buffer, REQUEST_SIZE,
+                      write_reply, client);
 }
 
 /* once we're done, loop again. */
-static struct io_op *write_complete(struct io_conn *conn, struct client *client)
+static struct io_plan *write_complete(struct io_conn *conn, struct client *client)
 {
        completed++;
        return read_request(conn, client);
 }
 
-static struct io_op *write_reply(struct io_conn *conn, struct client *client)
+static struct io_plan *write_reply(struct io_conn *conn, struct client *client)
 {
-       return io_write(client->reply_buffer, REPLY_SIZE,
-                       io_next(conn, write_complete, client));
+       return io_write(conn, client->reply_buffer, REPLY_SIZE,
+                       write_complete, client);
 }
 
 /* This runs in the child. */
@@ -106,14 +106,14 @@ static void sigalarm(int sig)
        write(timeout[1], "1", 1);
 }
 
-static struct io_op *do_timeout(struct io_conn *conn, char *buf)
+static struct io_plan *do_timeout(struct io_conn *conn, char *buf)
 {
-       return io_break(conn, NULL);
+       return io_break(conn, buf, NULL, NULL);
 }
 
-static struct io_op *do_timeout_read(struct io_conn *conn, char *buf)
+static struct io_plan *do_timeout_read(struct io_conn *conn, char *buf)
 {
-       return io_read(buf, 1, io_next(conn, do_timeout, buf));
+       return io_read(conn, buf, 1, do_timeout, buf);
 }
 
 int main(int argc, char *argv[])