server: include new options, bump server rev

Todo: convert the new error additions across the wire.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/cconv.c b/cconv.c
index 2bfe6aa09d9585884f0766a6d4ff504580c24aac..b023315f2bb1fbfeb0f00026e284fe3b9e34b203 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -58,7 +58,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->file_size_high = le64_to_cpu(top->file_size_high);
        o->start_offset = le64_to_cpu(top->start_offset);
 
-       for (i = 0; i < 2; i++) {
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                o->bs[i] = le32_to_cpu(top->bs[i]);
                o->ba[i] = le32_to_cpu(top->ba[i]);
                o->min_bs[i] = le32_to_cpu(top->min_bs[i]);
@@ -326,7 +326,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->compress_percentage = cpu_to_le32(o->compress_percentage);
        top->compress_chunk = cpu_to_le32(o->compress_chunk);
 
-       for (i = 0; i < 2; i++) {
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                top->bs[i] = cpu_to_le32(o->bs[i]);
                top->ba[i] = cpu_to_le32(o->ba[i]);
                top->min_bs[i] = cpu_to_le32(o->min_bs[i]);

diff --git a/server.h b/server.h
index 938f20a04374e5c9b18969c3eade76768a4d3d66..5273fd17cff55b45b7a20ccf45b042a3070f936a 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 17,
+       FIO_SERVER_VER                  = 18,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
 

diff --git a/thread_options.h b/thread_options.h
index abd735af33e20d8a5c659a2730b379678158d416..9b9079659801a9e9d94684b1c6abcdfbe49ff0c0 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -259,12 +259,12 @@ struct thread_options_pack {
        uint64_t file_size_high;
        uint64_t start_offset;
 
-       uint32_t bs[2];
-       uint32_t ba[2];
-       uint32_t min_bs[2];
-       uint32_t max_bs[2];
-       struct bssplit bssplit[2][BSSPLIT_MAX];
-       uint32_t bssplit_nr[2];
+       uint32_t bs[DDIR_RWDIR_CNT];
+       uint32_t ba[DDIR_RWDIR_CNT];
+       uint32_t min_bs[DDIR_RWDIR_CNT];
+       uint32_t max_bs[DDIR_RWDIR_CNT];
+       struct bssplit bssplit[DDIR_RWDIR_CNT][BSSPLIT_MAX];
+       uint32_t bssplit_nr[DDIR_RWDIR_CNT];
 
        uint32_t ignore_error[ERROR_TYPE_CNT][ERROR_STR_MAX];
        uint32_t ignore_error_nr[ERROR_TYPE_CNT];
@@ -383,11 +383,11 @@ struct thread_options_pack {
        uint8_t exec_prerun[FIO_TOP_STR_MAX];
        uint8_t exec_postrun[FIO_TOP_STR_MAX];
 
-       uint32_t rate[2];
-       uint32_t ratemin[2];
+       uint32_t rate[DDIR_RWDIR_CNT];
+       uint32_t ratemin[DDIR_RWDIR_CNT];
        uint32_t ratecycle;
-       uint32_t rate_iops[2];
-       uint32_t rate_iops_min[2];
+       uint32_t rate_iops[DDIR_RWDIR_CNT];
+       uint32_t rate_iops_min[DDIR_RWDIR_CNT];
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];