Fio 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>

diff --git a/fio.h b/fio.h
index 65f79e03ee2f0f88789bd1329e0c046650de9168..cfd928cebed4265e2a5bfd0fa684e3afe9b5b704 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -18,7 +18,7 @@ struct thread_data;
 
 #define FIO_MAJOR      1
 #define FIO_MINOR      99
 
 #define FIO_MAJOR      1
 #define FIO_MINOR      99

-#define FIO_PATCH      0
+#define FIO_PATCH      1

 
 #include "compiler/compiler.h"
 #include "flist.h"
 
 #include "compiler/compiler.h"
 #include "flist.h"

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 708819d254383de7fe323f86b5565bdc11f51657..e4134a1fb2278b6c46756d2bd110af7935b923b2 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
 \r
 <?define VersionMajor = 1?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
 \r
 <?define VersionMajor = 1?>\r

-<?define VersionMinor = 58?>\r
-<?define VersionBuild = 0?>\r
+<?define VersionMinor = 99?>\r
+<?define VersionBuild = 1?>\r

 \r
        <Product Id="*"\r
          Codepage="1252" Language="1033"\r
 \r
        <Product Id="*"\r
          Codepage="1252" Language="1033"\r

diff --git a/os/windows/version.h b/os/windows/version.h
index e2c95f547308838d22707576f70d7228c82be035..1fd1ab5891ce28edad6b789c723f88e8b47129cb 100644 (file)
--- a/os/windows/version.h
+++ b/os/windows/version.h
@@ -1,4 +1,4 @@
 #define FIO_VERSION_MAJOR 1\r
 #define FIO_VERSION_MAJOR 1\r

-#define FIO_VERSION_MINOR 58\r
-#define FIO_VERSION_BUILD 0\r
-#define FIO_VERSION_STRING "1.58"\r
+#define FIO_VERSION_MINOR 99\r
+#define FIO_VERSION_BUILD 1\r
+#define FIO_VERSION_STRING "1.99.1"\r

diff --git a/server.c b/server.c
index 6f216d5d1aa83d794b75ca94e2c9668a196ea86b..c4a0b7ef9b274613743e3405ef747aa388d16ae5 100644 (file)
--- 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) {
        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);
                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)
 {
 
 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));
        fio_net_cmd_crc(&cmd);
 
        return fio_send_data(sk, &cmd, sizeof(cmd));

diff --git a/server.h b/server.h
index 82a6db660ce7a4a72fa4cfeabd555f07dfae5e30..b895dc31eb4079ea2b482508b6eab9849eacf4c4 100644 (file)
--- a/server.h
+++ b/server.h
@@ -26,8 +26,9 @@ struct fio_net_cmd {
 };
 
 enum {
 };
 
 enum {

-       FIO_SERVER_VER          = 1,
+       FIO_SERVER_VER          = 2,

        FIO_SERVER_VER1         = 1,
        FIO_SERVER_VER1         = 1,

+       FIO_SERVER_VER2         = 2,

 
        FIO_SERVER_MAX_PDU      = 64,
 
 
        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));
 
 {
        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) {
        cmd->opcode     = cpu_to_le16(opcode);
 
        if (pdu) {