net: fix error reported on job exit and full residual

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index 3e26131be9a9913b853080b8ab85695aff60fb98..61bdfdd19be81a06fe1ae295b7898546f803de39 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -515,11 +515,13 @@ static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
                ret = 0;        /* must be a SYNC */
 
        if (ret != (int) io_u->xfer_buflen) {
-               if (ret >= 0) {
+               if (ret > 0) {
                        io_u->resid = io_u->xfer_buflen - ret;
                        io_u->error = 0;
                        return FIO_Q_COMPLETED;
-               } else {
+               } else if (!ret)
+                       return FIO_Q_BUSY;
+               else {
                        int err = errno;
 
                        if (ddir == DDIR_WRITE && err == EMSGSIZE)
@@ -999,13 +1001,11 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
        struct netio_options *o = td->eo;
        struct ip_mreq mr;
        struct sockaddr_in sin;
-       struct sockaddr_in6 sin6;
        struct sockaddr *saddr;
        int fd, opt, type, domain;
        socklen_t len;
 
        memset(&sin, 0, sizeof(sin));
-       memset(&sin6, 0, sizeof(sin6));
 
        if (o->proto == FIO_TYPE_TCP) {
                type = SOCK_STREAM;
@@ -1088,7 +1088,7 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                len = sizeof(nd->addr6);
 
                nd->addr6.sin6_family = AF_INET6;
-               nd->addr6.sin6_addr = sin6.sin6_addr.s6_addr ? sin6.sin6_addr : in6addr_any;
+               nd->addr6.sin6_addr = in6addr_any;
                nd->addr6.sin6_port = htons(port);
        }
 
@@ -1215,7 +1215,7 @@ static int fio_netio_setup(struct thread_data *td)
 
 static void fio_netio_terminate(struct thread_data *td)
 {
-       kill(td->pid, SIGUSR2);
+       kill(td->pid, SIGTERM);
 }
 
 #ifdef CONFIG_LINUX_SPLICE