ccan/io: keep always pointers to plans, not a linked list.

[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 7a95fd8426bbbf8020f93db8177c98654da41c07..c540f48d3a12744317a6316a8acbc6e7c76a1f5f 100644 (file)
--- a/ccan/io/benchmarks/run-different-speed.c
+++ b/ccan/io/benchmarks/run-different-speed.c
@@ -60,7 +60,7 @@ static void create_clients(struct sockaddr_un *addr, int waitfd)
                if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
                        err(1, "connecting socket");
                /* Make nonblocking. */
-               fcntl(sock[i], F_SETFD, fcntl(sock[i], F_GETFD)|O_NONBLOCK);
+               io_fd_block(sock[i], false);
                done[i] = 0;
        }
 
@@ -152,12 +152,11 @@ int main(int argc, char *argv[])
                        /* For efficiency, we share client structure */
                        io_new_conn(ret,
                                    io_read(client.request_buffer, REQUEST_SIZE,
-                                           write_reply, &client),
-                                   NULL, NULL);
+                                           write_reply, &client));
                }
        }
 
-       io_new_conn(timeout[0], io_read(&buf, 1, do_timeout, &buf), NULL, NULL);
+       io_new_conn(timeout[0], io_read(&buf, 1, do_timeout, &buf));
 
        close(wake[0]);
        for (i = 0; i < NUM_CHILDREN; i++)