Recent changes (master)
The following changes since commit c5dd5d977884648f78c266e9873f667a3ed98bda:
powerpc: fix cpus_online() to get correct max CPU number for powerpc64 (2016-01-25 08:29:50 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to a8381d78ec52d00541ddd7ef8bd7584e99361b0e:
Fio 2.6 (2016-01-26 19:02:07 -0700)
----------------------------------------------------------------
Jens Axboe (4):
client: remove debug printf() for compressed iolog
server: disable pdu length check for now
server: split vectored commands into fragments Fio 2.6
FIO-VERSION-GEN | 2 +- client.c | 1 - os/windows/install.wxs | 2 +- server.c | 30 ++++++++++++++++++++++++------ 4 files changed, 26 insertions(+), 9 deletions(-)
---
Diff of recent changes:
FIO-VERSION-GEN +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh GVF=FIO-VERSION-FILE -DEF_VER=fio-2.5 +DEF_VER=fio-2.6 LF=' '
client.c +0 -1
@@ -1460,7 +1460,6 @@ static struct cmd_iolog_pdu *convert_iolog(struct fio_net_cmd *cmd,return NULL ;#endif ret =convert_iolog_gz (cmd, pdu); -printf ("compressed iolog, %p\n" , ret);if (!ret) {log_err ("fio: failed decompressing log\n" );return NULL ;
os/windows/install.wxs +1 -1
@@ -10,7 +10,7 @@ <Product Id="*" Codepage="1252" Language="1033" Manufacturer="fio" Name="fio" - UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.5"> + UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.6"> <Package Description="Flexible IO Tester" InstallerVersion="301" Keywords="Installer,MSI,Database"
server.c +24 -6
@@ -1062,17 +1062,35 @@ static int fio_send_cmd_ext_pdu(int sk, uint16_t opcode, const void *buf, {struct fio_net_cmd cmd;struct iovec iov[2 ]; +size_t this_len; +int ret; iov[0 ].iov_base = (void *) &cmd; iov[0 ].iov_len =sizeof (cmd); - iov[1 ].iov_base = (void *) buf; - iov[1 ].iov_len = size; -__fio_init_net_cmd (&cmd, opcode, size, tag); - cmd.flags =__cpu_to_le32 (flags); -fio_net_cmd_crc_pdu (&cmd, buf); +do { +uint32_t this_flags = flags; + + this_len = size; +if (this_len >FIO_SERVER_MAX_FRAGMENT_PDU ) + this_len =FIO_SERVER_MAX_FRAGMENT_PDU ; + +if (this_len < size) + this_flags |=FIO_NET_CMD_F_MORE ; -return fio_sendv_data (sk, iov,2 ); +__fio_init_net_cmd (&cmd, opcode, this_len, tag); + cmd.flags =__cpu_to_le32 (this_flags); +fio_net_cmd_crc_pdu (&cmd, buf); + + iov[1 ].iov_base = (void *) buf; + iov[1 ].iov_len = this_len; + + ret =fio_sendv_data (sk, iov,2 ); + size -= this_len; + buf += this_len; + }while (!ret && size); + +return ret; }static void finish_entry (struct sk_entry *entry)