]> git.ozlabs.org Git - ccan/blobdiff - ccan/io/benchmarks/run-loop.c
Revert "io: closing one side of a duplex connection closes both."
[ccan] / ccan / io / benchmarks / run-loop.c
index b0e6b02c804fec579ed2d6019b3d266f993aeb7e..ef01cf6a94663597dec0b4f7d0fe63bbe9c02f7a 100644 (file)
@@ -23,7 +23,7 @@ static struct io_plan poke_writer(struct io_conn *conn, struct buffer *buf)
        assert(conn == buf->reader);
 
        if (buf->iters == NUM_ITERS)
-               return io_close(conn, NULL);
+               return io_close();
 
        /* You write. */
        io_wake(buf->writer,
@@ -41,7 +41,7 @@ static struct io_plan poke_reader(struct io_conn *conn, struct buffer *buf)
                io_read(&buf->buf, sizeof(buf->buf), poke_writer, buf));
 
        if (++buf->iters == NUM_ITERS)
-               return io_close(conn, NULL);
+               return io_close();
 
        /* I'll wait until you tell me to write. */
        return io_idle();
@@ -66,14 +66,13 @@ int main(void)
                memset(buf[i].buf, i, sizeof(buf[i].buf));
                sprintf(buf[i].buf, "%i-%i", i, i);
 
-               buf[i].reader = io_new_conn(last_read, io_idle(), NULL, NULL);
+               buf[i].reader = io_new_conn(last_read, io_idle());
                if (!buf[i].reader)
                        err(1, "Creating reader %i", i);
                buf[i].writer = io_new_conn(fds[1],
                                            io_write(&buf[i].buf,
                                                     sizeof(buf[i].buf),
-                                                    poke_reader, &buf[i]),
-                                           NULL, NULL);
+                                                    poke_reader, &buf[i]));
                if (!buf[i].writer)
                        err(1, "Creating writer %i", i);
                last_read = fds[0];
@@ -83,13 +82,12 @@ int main(void)
        i = 0;
        buf[i].iters = 0;
        sprintf(buf[i].buf, "%i-%i", i, i);
-       buf[i].reader = io_new_conn(last_read, io_idle(), NULL, NULL);
+       buf[i].reader = io_new_conn(last_read, io_idle());
        if (!buf[i].reader)
                err(1, "Creating reader %i", i);
        buf[i].writer = io_new_conn(last_write, io_write(&buf[i].buf,
                                                         sizeof(buf[i].buf),
-                                                        poke_reader, &buf[i]),
-                                   NULL, NULL);
+                                                        poke_reader, &buf[i]));
        if (!buf[i].writer)
                err(1, "Creating writer %i", i);