From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 24 Sep 2012 07:39:49 +0000 (+0200)
Subject: server: include new options, bump server rev
X-Git-Tag: fio-2.1~57^2~59
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b999b3c74daa2dedd398544e898b54d8b221314c;p=fio.git

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 2bfe6aa0..b023315f 100644
--- 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 938f20a0..5273fd17 100644
--- 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 abd735af..9b907965 100644
--- 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];