projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of lockfile callback
[fio.git]
/
engines
/
net.c
diff --git
a/engines/net.c
b/engines/net.c
index 5778bb0864a1399122623cac61c36d9bc439d7a4..7a0fe696c1b81c7ff0dba9539387a0f16c5d7bdb 100644
(file)
--- a/
engines/net.c
+++ b/
engines/net.c
@@
-485,7
+485,7
@@
static void store_udp_seq(struct netio_data *nd, struct io_u *io_u)
struct udp_seq *us;
us = io_u->xfer_buf + io_u->xfer_buflen - sizeof(*us);
struct udp_seq *us;
us = io_u->xfer_buf + io_u->xfer_buflen - sizeof(*us);
- us->magic = cpu_to_le64(FIO_UDP_SEQ_MAGIC);
+ 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++);
}
us->bs = cpu_to_le64((uint64_t) io_u->xfer_buflen);
us->seq = cpu_to_le64(nd->udp_send_seq++);
}
@@
-562,7
+562,7
@@
static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
return ret;
}
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;
{
struct udp_close_msg *msg;
@@
-570,9
+570,9
@@
static int is_udp_close(struct io_u *io_u, int len)
return 0;
msg = io_u->xfer_buf;
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;
return 0;
- if (
ntohl
(msg->cmd) != FIO_LINK_CLOSE)
+ if (
le32_to_cpu
(msg->cmd) != FIO_LINK_CLOSE)
return 0;
return 1;
return 0;
return 1;
@@
-605,13
+605,18
@@
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);
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);
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;
}
if (ret > 0)
break;
@@
-864,7
+869,7
@@
err:
return 1;
}
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;
{
struct netio_data *nd = td->io_ops->data;
struct netio_options *o = td->eo;
@@
-881,8
+886,8
@@
static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
len = sizeof(nd->addr);
}
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)
ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, len);
if (ret < 0)
@@
-891,14
+896,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)
{
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);
}
return generic_close_file(td, f);
}
@@
-937,7
+938,7
@@
static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
return 0;
}
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;
{
struct netio_data *nd = td->io_ops->data;
struct netio_options *o = td->eo;
@@
-983,7
+984,7
@@
static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
if (is_udp(o)) {
if (td_write(td))
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;
else {
int state;
@@
-1307,6
+1308,8
@@
static int fio_netio_init(struct thread_data *td)
return 1;
}
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");
if (!is_tcp(o)) {
if (o->listen) {
log_err("fio: listen only valid for TCP proto IO\n");