X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fnet.c;h=12f49a2a67ca2f1d7241b42efdc45543b77fd868;hb=95820b6e6c92025df8d89c0bf39b174e53137c41;hp=bbfce811cc67d3605c7154281c5d1195a717b313;hpb=49758e11f3658686ccd1c61724a5eba142f3ee4f;p=fio.git diff --git a/engines/net.c b/engines/net.c index bbfce811..12f49a2a 100644 --- a/engines/net.c +++ b/engines/net.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ struct netio_options { unsigned int proto; unsigned int listen; unsigned int pingpong; + unsigned int nodelay; }; struct udp_close_msg { @@ -96,6 +98,14 @@ static struct fio_option options[] = { }, }, }, +#ifdef CONFIG_TCP_NODELAY + { + .name = "nodelay", + .type = FIO_OPT_BOOL, + .off1 = offsetof(struct netio_options, nodelay), + .help = "Use TCP_NODELAY on TCP connections", + }, +#endif { .name = "listen", .lname = "net engine listen", @@ -165,7 +175,7 @@ static int fio_netio_prep(struct thread_data *td, struct io_u *io_u) return 0; } -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE static int splice_io_u(int fdin, int fdout, unsigned int len) { int bytes = 0; @@ -360,7 +370,7 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u) do { if (o->proto == FIO_TYPE_UDP) { - fio_socklen_t len = sizeof(nd->addr); + socklen_t len = sizeof(nd->addr); struct sockaddr *from = (struct sockaddr *) &nd->addr; ret = recvfrom(io_u->file->fd, io_u->xfer_buf, @@ -456,7 +466,7 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f) { struct netio_data *nd = td->io_ops->data; struct netio_options *o = td->eo; - int type, domain; + int type, domain, optval; if (o->proto == FIO_TYPE_TCP) { domain = AF_INET; @@ -479,10 +489,20 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f) return 1; } +#ifdef CONFIG_TCP_NODELAY + if (o->nodelay && o->proto == FIO_TYPE_TCP) { + optval = 1; + if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) { + log_err("fio: cannot set TCP_NODELAY option on socket (%s), disable with 'nodelay=0'\n", strerror(errno)); + return 1; + } + } +#endif + if (o->proto == FIO_TYPE_UDP) return 0; else if (o->proto == FIO_TYPE_TCP) { - fio_socklen_t len = sizeof(nd->addr); + socklen_t len = sizeof(nd->addr); if (connect(f->fd, (struct sockaddr *) &nd->addr, len) < 0) { td_verror(td, errno, "connect"); @@ -491,7 +511,7 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f) } } else { struct sockaddr_un *addr = &nd->addr_un; - fio_socklen_t len; + socklen_t len; len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1; @@ -509,8 +529,8 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f) { struct netio_data *nd = td->io_ops->data; struct netio_options *o = td->eo; - fio_socklen_t socklen = sizeof(nd->addr); - int state; + socklen_t socklen = sizeof(nd->addr); + int state, optval; if (o->proto == FIO_TYPE_UDP) { f->fd = nd->listenfd; @@ -531,6 +551,16 @@ static int fio_netio_accept(struct thread_data *td, struct fio_file *f) goto err; } +#ifdef CONFIG_TCP_NODELAY + if (o->nodelay && o->proto == FIO_TYPE_TCP) { + optval = 1; + if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) { + log_err("fio: cannot set TCP_NODELAY option on socket (%s), disable with 'nodelay=0'\n", strerror(errno)); + return 1; + } + } +#endif + reset_all_stats(td); td_set_runstate(td, state); return 0; @@ -549,7 +579,7 @@ static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f) msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC); msg.cmd = htonl(FIO_LINK_CLOSE); - ret = sendto(f->fd, &msg, sizeof(msg), MSG_WAITALL, to, + ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, sizeof(nd->addr)); if (ret < 0) td_verror(td, errno, "sendto udp link close"); @@ -574,10 +604,10 @@ static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f) struct netio_data *nd = td->io_ops->data; struct udp_close_msg msg; struct sockaddr *to = (struct sockaddr *) &nd->addr; - fio_socklen_t len = sizeof(nd->addr); + socklen_t len = sizeof(nd->addr); int ret; - ret = recvfrom(f->fd, &msg, sizeof(msg), MSG_WAITALL, to, &len); + ret = recvfrom(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, &len); if (ret < 0) { td_verror(td, errno, "sendto udp link open"); return ret; @@ -603,7 +633,7 @@ static int fio_netio_udp_send_open(struct thread_data *td, struct fio_file *f) msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC); msg.cmd = htonl(FIO_LINK_OPEN); - ret = sendto(f->fd, &msg, sizeof(msg), MSG_WAITALL, to, + ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, sizeof(nd->addr)); if (ret < 0) { td_verror(td, errno, "sendto udp link open"); @@ -751,12 +781,12 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port) } opt = 1; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *) &opt, sizeof(opt)) < 0) { td_verror(td, errno, "setsockopt"); return 1; } #ifdef SO_REUSEPORT - if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) { + if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (void *) &opt, sizeof(opt)) < 0) { td_verror(td, errno, "setsockopt"); return 1; } @@ -895,7 +925,7 @@ static void fio_netio_terminate(struct thread_data *td) kill(td->pid, SIGUSR2); } -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE static int fio_netio_setup_splice(struct thread_data *td) { struct netio_data *nd; @@ -962,7 +992,7 @@ static int str_hostname_cb(void *data, const char *input) static void fio_init fio_netio_register(void) { register_ioengine(&ioengine_rw); -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE register_ioengine(&ioengine_splice); #endif } @@ -970,7 +1000,7 @@ static void fio_init fio_netio_register(void) static void fio_exit fio_netio_unregister(void) { unregister_ioengine(&ioengine_rw); -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE unregister_ioengine(&ioengine_splice); #endif }