options: make the groups/categories constant

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index 9a327da8a442659f1098711671227102c27126da..cd19535294a083eff56c97036aef75f8c4615541 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -21,14 +21,18 @@
 #include <sys/un.h>
 
 #include "../fio.h"
+#include "../verify.h"
 
 struct netio_data {
        int listenfd;
        int use_splice;
+       int seq_off;
        int pipes[2];
        struct sockaddr_in addr;
        struct sockaddr_in6 addr6;
        struct sockaddr_un addr_un;
+       uint64_t udp_send_seq;
+       uint64_t udp_recv_seq;
 };
 
 struct netio_options {
@@ -49,10 +53,17 @@ struct udp_close_msg {
        uint32_t cmd;
 };
 
+struct udp_seq {
+       uint64_t magic;
+       uint64_t seq;
+       uint64_t bs;
+};
+
 enum {
        FIO_LINK_CLOSE = 0x89,
        FIO_LINK_OPEN_CLOSE_MAGIC = 0x6c696e6b,
        FIO_LINK_OPEN = 0x98,
+       FIO_UDP_SEQ_MAGIC = 0x657375716e556563ULL,
 
        FIO_TYPE_TCP    = 1,
        FIO_TYPE_UDP    = 2,
@@ -469,6 +480,47 @@ static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
 }
 #endif
 
+static void store_udp_seq(struct netio_data *nd, struct io_u *io_u)
+{
+       struct udp_seq *us;
+
+       if (io_u->xfer_buflen < sizeof(*us))
+               return;
+
+       us = io_u->xfer_buf + io_u->xfer_buflen - sizeof(*us);
+       us->magic = cpu_to_le64((uint64_t) FIO_UDP_SEQ_MAGIC);
+       us->bs = cpu_to_le64((uint64_t) io_u->xfer_buflen);
+       us->seq = cpu_to_le64(nd->udp_send_seq++);
+}
+
+static void verify_udp_seq(struct thread_data *td, struct netio_data *nd,
+                          struct io_u *io_u)
+{
+       struct udp_seq *us;
+       uint64_t seq;
+
+       if (io_u->xfer_buflen < sizeof(*us))
+               return;
+
+       if (nd->seq_off)
+               return;
+
+       us = io_u->xfer_buf + io_u->xfer_buflen - sizeof(*us);
+       if (le64_to_cpu(us->magic) != FIO_UDP_SEQ_MAGIC)
+               return;
+       if (le64_to_cpu(us->bs) != io_u->xfer_buflen) {
+               nd->seq_off = 1;
+               return;
+       }
+
+       seq = le64_to_cpu(us->seq);
+
+       if (seq != nd->udp_recv_seq)
+               td->ts.drop_io_u[io_u->ddir] += seq - nd->udp_recv_seq;
+
+       nd->udp_recv_seq = seq + 1;
+}
+
 static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
 {
        struct netio_data *nd = td->io_ops->data;
@@ -488,6 +540,9 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
                                len = sizeof(nd->addr);
                        }
 
+                       if (td->o.verify == VERIFY_NONE)
+                               store_udp_seq(nd, io_u);
+
                        ret = sendto(io_u->file->fd, io_u->xfer_buf,
                                        io_u->xfer_buflen, flags, to, len);
                } else {
@@ -513,7 +568,7 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
        return ret;
 }
 
-static int is_udp_close(struct io_u *io_u, int len)
+static int is_close_msg(struct io_u *io_u, int len)
 {
        struct udp_close_msg *msg;
 
@@ -521,9 +576,9 @@ static int is_udp_close(struct io_u *io_u, int len)
                return 0;
 
        msg = io_u->xfer_buf;
-       if (ntohl(msg->magic) != FIO_LINK_OPEN_CLOSE_MAGIC)
+       if (le32_to_cpu(msg->magic) != FIO_LINK_OPEN_CLOSE_MAGIC)
                return 0;
-       if (ntohl(msg->cmd) != FIO_LINK_CLOSE)
+       if (le32_to_cpu(msg->cmd) != FIO_LINK_CLOSE)
                return 0;
 
        return 1;
@@ -555,13 +610,19 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
 
                        ret = recvfrom(io_u->file->fd, io_u->xfer_buf,
                                        io_u->xfer_buflen, flags, from, len);
-                       if (is_udp_close(io_u, ret)) {
+
+                       if (is_close_msg(io_u, ret)) {
                                td->done = 1;
                                return 0;
                        }
                } else {
                        ret = recv(io_u->file->fd, io_u->xfer_buf,
                                        io_u->xfer_buflen, flags);
+
+                       if (is_close_msg(io_u, ret)) {
+                               td->done = 1;
+                               return 0;
+                       }
                }
                if (ret > 0)
                        break;
@@ -574,6 +635,9 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
                flags |= MSG_WAITALL;
        } while (1);
 
+       if (is_udp(o) && td->o.verify == VERIFY_NONE)
+               verify_udp_seq(td, nd, io_u);
+
        return ret;
 }
 
@@ -811,7 +875,7 @@ err:
        return 1;
 }
 
-static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
+static void fio_netio_send_close(struct thread_data *td, struct fio_file *f)
 {
        struct netio_data *nd = td->io_ops->data;
        struct netio_options *o = td->eo;
@@ -828,8 +892,8 @@ static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
                len = sizeof(nd->addr);
        }
 
-       msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC);
-       msg.cmd = htonl(FIO_LINK_CLOSE);
+       msg.magic = cpu_to_le32((uint32_t) FIO_LINK_OPEN_CLOSE_MAGIC);
+       msg.cmd = cpu_to_le32((uint32_t) FIO_LINK_CLOSE);
 
        ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, len);
        if (ret < 0)
@@ -838,14 +902,10 @@ static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
 
 static int fio_netio_close_file(struct thread_data *td, struct fio_file *f)
 {
-       struct netio_options *o = td->eo;
-
        /*
-        * If this is an UDP connection, notify the receiver that we are
-        * closing down the link
+        * Notify the receiver that we are closing down the link
         */
-       if (is_udp(o))
-               fio_netio_udp_close(td, f);
+       fio_netio_send_close(td, f);
 
        return generic_close_file(td, f);
 }
@@ -880,10 +940,11 @@ static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
                return -1;
        }
 
+       fio_gettime(&td->start, NULL);
        return 0;
 }
 
-static int fio_netio_udp_send_open(struct thread_data *td, struct fio_file *f)
+static int fio_netio_send_open(struct thread_data *td, struct fio_file *f)
 {
        struct netio_data *nd = td->io_ops->data;
        struct netio_options *o = td->eo;
@@ -929,7 +990,7 @@ static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
 
        if (is_udp(o)) {
                if (td_write(td))
-                       ret = fio_netio_udp_send_open(td, f);
+                       ret = fio_netio_send_open(td, f);
                else {
                        int state;
 
@@ -1253,6 +1314,8 @@ static int fio_netio_init(struct thread_data *td)
                return 1;
        }
 
+       o->port += td->subjob_number;
+
        if (!is_tcp(o)) {
                if (o->listen) {
                        log_err("fio: listen only valid for TCP proto IO\n");