projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove redundant _fio_rbd_disconnect, which is already called in
[fio.git]
/
engines
/
net.c
diff --git
a/engines/net.c
b/engines/net.c
index cd19535294a083eff56c97036aef75f8c4615541..37d44fd803d32ef578dd0a085bc3be7d9d48cd65 100644
(file)
--- a/
engines/net.c
+++ b/
engines/net.c
@@
-22,6
+22,7
@@
#include "../fio.h"
#include "../verify.h"
#include "../fio.h"
#include "../verify.h"
+#include "../optgroup.h"
struct netio_data {
int listenfd;
struct netio_data {
int listenfd;
@@
-134,6
+135,7
@@
static struct fio_option options[] = {
#ifdef CONFIG_TCP_NODELAY
{
.name = "nodelay",
#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",
.type = FIO_OPT_BOOL,
.off1 = offsetof(struct netio_options, nodelay),
.help = "Use TCP_NODELAY on TCP connections",
@@
-152,6
+154,7
@@
static struct fio_option options[] = {
},
{
.name = "pingpong",
},
{
.name = "pingpong",
+ .lname = "Ping Pong",
.type = FIO_OPT_STR_SET,
.off1 = offsetof(struct netio_options, pingpong),
.help = "Ping-pong IO requests",
.type = FIO_OPT_STR_SET,
.off1 = offsetof(struct netio_options, pingpong),
.help = "Ping-pong IO requests",
@@
-373,7
+376,7
@@
static int splice_io_u(int fdin, int fdout, unsigned int len)
*/
static int splice_in(struct thread_data *td, struct io_u *io_u)
{
*/
static int splice_in(struct thread_data *td, struct io_u *io_u)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
return splice_io_u(io_u->file->fd, nd->pipes[1], io_u->xfer_buflen);
}
return splice_io_u(io_u->file->fd, nd->pipes[1], io_u->xfer_buflen);
}
@@
-384,7
+387,7
@@
static int splice_in(struct thread_data *td, struct io_u *io_u)
static int splice_out(struct thread_data *td, struct io_u *io_u,
unsigned int len)
{
static int splice_out(struct thread_data *td, struct io_u *io_u,
unsigned int len)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
return splice_io_u(nd->pipes[0], io_u->file->fd, len);
}
return splice_io_u(nd->pipes[0], io_u->file->fd, len);
}
@@
-422,7
+425,7
@@
static int vmsplice_io_u(struct io_u *io_u, int fd, unsigned int len)
static int vmsplice_io_u_out(struct thread_data *td, struct io_u *io_u,
unsigned int len)
{
static int vmsplice_io_u_out(struct thread_data *td, struct io_u *io_u,
unsigned int len)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
return vmsplice_io_u(io_u, nd->pipes[0], len);
}
return vmsplice_io_u(io_u, nd->pipes[0], len);
}
@@
-432,7
+435,7
@@
static int vmsplice_io_u_out(struct thread_data *td, struct io_u *io_u,
*/
static int vmsplice_io_u_in(struct thread_data *td, struct io_u *io_u)
{
*/
static int vmsplice_io_u_in(struct thread_data *td, struct io_u *io_u)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
return vmsplice_io_u(io_u, nd->pipes[1], io_u->xfer_buflen);
}
return vmsplice_io_u(io_u, nd->pipes[1], io_u->xfer_buflen);
}
@@
-523,7
+526,7
@@
static void verify_udp_seq(struct thread_data *td, struct netio_data *nd,
static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
{
static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
int ret, flags = 0;
struct netio_options *o = td->eo;
int ret, flags = 0;
@@
-586,7
+589,7
@@
static int is_close_msg(struct io_u *io_u, int len)
static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
{
static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
int ret, flags = 0;
struct netio_options *o = td->eo;
int ret, flags = 0;
@@
-644,7
+647,7
@@
static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
enum fio_ddir ddir)
{
static int __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_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
int ret;
struct netio_options *o = td->eo;
int ret;
@@
-710,7
+713,7
@@
static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
{
static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
int type, domain;
struct netio_options *o = td->eo;
int type, domain;
@@
-825,7
+828,7
@@
static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
{
static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
socklen_t socklen;
int state;
struct netio_options *o = td->eo;
socklen_t socklen;
int state;
@@
-877,7
+880,7
@@
err:
static void fio_netio_send_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_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
struct udp_close_msg msg;
struct sockaddr *to;
struct netio_options *o = td->eo;
struct udp_close_msg msg;
struct sockaddr *to;
@@
-912,7
+915,7
@@
static int fio_netio_close_file(struct thread_data *td, struct fio_file *f)
static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
{
static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
struct udp_close_msg msg;
struct sockaddr *to;
struct netio_options *o = td->eo;
struct udp_close_msg msg;
struct sockaddr *to;
@@
-946,7
+949,7
@@
static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
static int fio_netio_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_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
struct udp_close_msg msg;
struct sockaddr *to;
struct netio_options *o = td->eo;
struct udp_close_msg msg;
struct sockaddr *to;
@@
-1048,7
+1051,7
@@
static int fio_fill_addr(struct thread_data *td, const char *host, int af,
static int fio_netio_setup_connect_inet(struct thread_data *td,
const char *host, unsigned short port)
{
static int fio_netio_setup_connect_inet(struct thread_data *td,
const char *host, unsigned short port)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
struct addrinfo *res = NULL;
void *dst, *src;
struct netio_options *o = td->eo;
struct addrinfo *res = NULL;
void *dst, *src;
@@
-1098,7
+1101,7
@@
static int fio_netio_setup_connect_inet(struct thread_data *td,
static int fio_netio_setup_connect_unix(struct thread_data *td,
const char *path)
{
static int fio_netio_setup_connect_unix(struct thread_data *td,
const char *path)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct sockaddr_un *soun = &nd->addr_un;
soun->sun_family = AF_UNIX;
struct sockaddr_un *soun = &nd->addr_un;
soun->sun_family = AF_UNIX;
@@
-1119,7
+1122,7
@@
static int fio_netio_setup_connect(struct thread_data *td)
static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
{
static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct sockaddr_un *addr = &nd->addr_un;
mode_t mode;
int len, fd;
struct sockaddr_un *addr = &nd->addr_un;
mode_t mode;
int len, fd;
@@
-1152,7
+1155,7
@@
static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
{
static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
struct ip_mreq mr;
struct sockaddr_in sin;
struct netio_options *o = td->eo;
struct ip_mreq mr;
struct sockaddr_in sin;
@@
-1215,7
+1218,7
@@
static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
return 1;
}
if (is_ipv6(o)) {
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;
}
close(fd);
return 1;
}
@@
-1268,7
+1271,7
@@
static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
static int fio_netio_setup_listen(struct thread_data *td)
{
static int fio_netio_setup_listen(struct thread_data *td)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
struct netio_options *o = td->eo;
int ret;
struct netio_options *o = td->eo;
int ret;
@@
-1343,7
+1346,7
@@
static int fio_netio_init(struct thread_data *td)
static void fio_netio_cleanup(struct thread_data *td)
{
static void fio_netio_cleanup(struct thread_data *td)
{
- struct netio_data *nd = td->io_ops
->
data;
+ struct netio_data *nd = td->io_ops
_
data;
if (nd) {
if (nd->listenfd != -1)
if (nd) {
if (nd->listenfd != -1)
@@
-1367,13
+1370,13
@@
static int fio_netio_setup(struct thread_data *td)
td->o.open_files++;
}
td->o.open_files++;
}
- if (!td->io_ops
->
data) {
- nd = malloc(sizeof(*nd));
;
+ if (!td->io_ops
_
data) {
+ nd = malloc(sizeof(*nd));
memset(nd, 0, sizeof(*nd));
nd->listenfd = -1;
nd->pipes[0] = nd->pipes[1] = -1;
memset(nd, 0, sizeof(*nd));
nd->listenfd = -1;
nd->pipes[0] = nd->pipes[1] = -1;
- td->io_ops
->
data = nd;
+ td->io_ops
_
data = nd;
}
return 0;
}
return 0;
@@
-1391,7
+1394,7
@@
static int fio_netio_setup_splice(struct thread_data *td)
fio_netio_setup(td);
fio_netio_setup(td);
- nd = td->io_ops
->
data;
+ nd = td->io_ops
_
data;
if (nd) {
if (pipe(nd->pipes) < 0)
return 1;
if (nd) {
if (pipe(nd->pipes) < 0)
return 1;