summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2011-10-05 22:14:31 +0200
committerJens Axboe <axboe@kernel.dk>2011-10-05 22:14:31 +0200
commit178cde9ff403da53428c5962b8600e47b4580d80 (patch)
tree4516f7c72bd6d3bc8f1141610f88ec2775c532f4
parent19c65179fad3e0a32a450401ba7d312169627fdd (diff)
downloadfio-178cde9ff403da53428c5962b8600e47b4580d80.tar.gz
fio-178cde9ff403da53428c5962b8600e47b4580d80.tar.bz2
Fio 1.99.1fio-1.99.1
Lots of little fixes, tag version 1.99.1. Also bump protocol version, due to the IEEE 754 packing some of the command payloads were changed. Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--fio.h2
-rwxr-xr-xos/windows/install.wxs4
-rw-r--r--os/windows/version.h6
-rw-r--r--server.c9
-rw-r--r--server.h5
5 files changed, 12 insertions, 14 deletions
diff --git a/fio.h b/fio.h
index 65f79e03..cfd928ce 100644
--- a/fio.h
+++ b/fio.h
@@ -18,7 +18,7 @@ struct thread_data;
#define FIO_MAJOR 1
#define FIO_MINOR 99
-#define FIO_PATCH 0
+#define FIO_PATCH 1
#include "compiler/compiler.h"
#include "flist.h"
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 708819d2..e4134a1f 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -2,8 +2,8 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?define VersionMajor = 1?>
-<?define VersionMinor = 58?>
-<?define VersionBuild = 0?>
+<?define VersionMinor = 99?>
+<?define VersionBuild = 1?>
<Product Id="*"
Codepage="1252" Language="1033"
diff --git a/os/windows/version.h b/os/windows/version.h
index e2c95f54..1fd1ab58 100644
--- a/os/windows/version.h
+++ b/os/windows/version.h
@@ -1,4 +1,4 @@
#define FIO_VERSION_MAJOR 1
-#define FIO_VERSION_MINOR 58
-#define FIO_VERSION_BUILD 0
-#define FIO_VERSION_STRING "1.58"
+#define FIO_VERSION_MINOR 99
+#define FIO_VERSION_BUILD 1
+#define FIO_VERSION_STRING "1.99.1"
diff --git a/server.c b/server.c
index 6f216d5d..c4a0b7ef 100644
--- a/server.c
+++ b/server.c
@@ -95,7 +95,7 @@ static int verify_convert_cmd(struct fio_net_cmd *cmd)
cmd->pdu_len = le32_to_cpu(cmd->pdu_len);
switch (cmd->version) {
- case FIO_SERVER_VER1:
+ case FIO_SERVER_VER2:
break;
default:
log_err("fio: bad server cmd version %d\n", cmd->version);
@@ -229,12 +229,9 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size)
int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial)
{
- struct fio_net_cmd cmd = {
- .version = __cpu_to_le16(FIO_SERVER_VER1),
- .opcode = cpu_to_le16(opcode),
- .serial = cpu_to_le64(serial),
- };
+ struct fio_net_cmd cmd;
+ fio_init_net_cmd(&cmd, opcode, NULL, 0);
fio_net_cmd_crc(&cmd);
return fio_send_data(sk, &cmd, sizeof(cmd));
diff --git a/server.h b/server.h
index 82a6db66..b895dc31 100644
--- a/server.h
+++ b/server.h
@@ -26,8 +26,9 @@ struct fio_net_cmd {
};
enum {
- FIO_SERVER_VER = 1,
+ FIO_SERVER_VER = 2,
FIO_SERVER_VER1 = 1,
+ FIO_SERVER_VER2 = 2,
FIO_SERVER_MAX_PDU = 64,
@@ -102,7 +103,7 @@ static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
{
memset(cmd, 0, sizeof(*cmd));
- cmd->version = __cpu_to_le16(FIO_SERVER_VER1);
+ cmd->version = __cpu_to_le16(FIO_SERVER_VER2);
cmd->opcode = cpu_to_le16(opcode);
if (pdu) {