fio: fix aio trim completion latencies

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index f24efc1d7fab63fbeab16a48c09b1ef3f3769668..ca6fb344b89786123e824dfa60eb913b4db33d6f 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -9,13 +9,11 @@
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-#include <assert.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <sys/poll.h>
-#include <sys/types.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -135,6 +133,7 @@ static struct fio_option options[] = {
 #ifdef CONFIG_TCP_NODELAY
        {
                .name   = "nodelay",
+               .lname  = "No Delay",
                .type   = FIO_OPT_BOOL,
                .off1   = offsetof(struct netio_options, nodelay),
                .help   = "Use TCP_NODELAY on TCP connections",
@@ -153,6 +152,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "pingpong",
+               .lname  = "Ping Pong",
                .type   = FIO_OPT_STR_SET,
                .off1   = offsetof(struct netio_options, pingpong),
                .help   = "Ping-pong IO requests",
@@ -642,8 +642,9 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
        return ret;
 }
 
-static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
-                            enum fio_ddir ddir)
+static enum fio_q_status __fio_netio_queue(struct thread_data *td,
+                                          struct io_u *io_u,
+                                          enum fio_ddir ddir)
 {
        struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
@@ -687,7 +688,8 @@ static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
        return FIO_Q_COMPLETED;
 }
 
-static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_netio_queue(struct thread_data *td,
+                                        struct io_u *io_u)
 {
        struct netio_options *o = td->eo;
        int ret;
@@ -1216,7 +1218,7 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                        return 1;
                }
                if (is_ipv6(o)) {
-                       log_err("fio: IPv6 not supported for multicast network IO");
+                       log_err("fio: IPv6 not supported for multicast network IO\n");
                        close(fd);
                        return 1;
                }
@@ -1369,7 +1371,7 @@ static int fio_netio_setup(struct thread_data *td)
        }
 
        if (!td->io_ops_data) {
-               nd = malloc(sizeof(*nd));;
+               nd = malloc(sizeof(*nd));
 
                memset(nd, 0, sizeof(*nd));
                nd->listenfd = -1;