/*
- * Transfer data over the net. Pretty basic setup, will only support
- * 1 file per thread/job.
+ * Transfer data over the net.
*/
#include <stdio.h>
#include <stdlib.h>
struct net_data *nd = td->io_ops->data;
struct fio_file *f = io_u->file;
- if (nd->send_to_net) {
- if (io_u->ddir == DDIR_READ) {
- td_verror(td, EINVAL);
- return 1;
- }
- } else {
- if (io_u->ddir == DDIR_WRITE) {
- td_verror(td, EINVAL);
- return 1;
- }
+ /*
+ * Make sure we don't see spurious reads to a receiver, and vice versa
+ */
+ if ((nd->send_to_net && io_u->ddir == DDIR_READ) ||
+ (!nd->send_to_net && io_u->ddir == DDIR_WRITE)) {
+ printf("boo!\n");
+ td_verror(td, EINVAL);
+ return 1;
}
-
+
if (io_u->ddir == DDIR_SYNC)
return 0;
if (io_u->offset == f->last_completed_pos)
{
struct net_data *nd = td->io_ops->data;
struct fio_file *f = io_u->file;
- unsigned int ret = 0;
-
- if (io_u->ddir == DDIR_WRITE)
- ret = write(f->fd, io_u->buf, io_u->buflen);
- else if (io_u->ddir == DDIR_READ)
- ret = read(f->fd, io_u->buf, io_u->buflen);
-
- if (ret != io_u->buflen) {
+ int ret, flags = 0;
+
+ if (io_u->ddir == DDIR_WRITE) {
+ /*
+ * if we are going to write more, set MSG_MORE
+ */
+ if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
+ td->io_size)
+ flags = MSG_MORE;
+
+ ret = send(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
+ } else if (io_u->ddir == DDIR_READ) {
+ flags = MSG_WAITALL;
+ ret = recv(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
+ } else
+ ret = 0; /* must be a SYNC */
+
+ if (ret != (int) io_u->xfer_buflen) {
if (ret > 0) {
- io_u->resid = io_u->buflen - ret;
- io_u->error = EIO;
+ io_u->resid = io_u->xfer_buflen - ret;
+ io_u->error = 0;
+ return ret;
} else
io_u->error = errno;
}
addr.sin_port = htons(port);
if (inet_aton(host, &addr.sin_addr) != 1) {
- struct hostent *hent = gethostbyname(host);
+ struct hostent *hent;
+ hent = gethostbyname(host);
if (!hent) {
- td_vmsg(td, errno, "gethostbyname");
+ td_verror(td, errno);
return 1;
}
}
for_each_file(td, f, i) {
- f->fd = socket(AF_INET, SOCK_STREAM, 0);
+ f->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (f->fd < 0) {
- td_vmsg(td, errno, "socket");
+ td_verror(td, errno);
return 1;
}
if (connect(f->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- td_vmsg(td, errno, "connect");
+ td_verror(td, errno);
return 1;
}
}
struct fio_file *f;
int fd, opt, i;
- fd = socket(AF_INET, SOCK_STREAM, 0);
+ fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (fd < 0) {
- td_vmsg(td, errno, "socket");
+ td_verror(td, errno);
return 1;
}
opt = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
- td_vmsg(td, errno, "setsockopt");
+ td_verror(td, errno);
+ return 1;
+ }
+#ifdef SO_REUSEPORT
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
+ td_verror(td, errno);
return 1;
}
+#endif
memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- td_vmsg(td, errno, "bind");
+ td_verror(td, errno);
return 1;
}
if (listen(fd, 1) < 0) {
- td_vmsg(td, errno, "listen");
+ td_verror(td, errno);
return 1;
}
for_each_file(td, f, i) {
f->fd = accept(fd, (struct sockaddr *) &addr, &socklen);
if (f->fd < 0) {
- td_vmsg(td, errno, "accept");
+ td_verror(td, errno);
return 1;
}
}
char *sep;
int ret, i;
+ if (!td->total_file_size) {
+ log_err("fio: need size= set\n");
+ return 1;
+ }
+
/*
* work around for late init call
*/
strcpy(host, buf);
port = atoi(sep);
- if (td->ddir == READ) {
+ if (td->ddir == DDIR_READ) {
nd->send_to_net = 0;
ret = fio_netio_setup_listen(td, port);
} else {