From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 11 Apr 2013 10:43:05 +0000 (+0200)
Subject: client/server: pass je->rate[] and je->iops[] over the net
X-Git-Tag: fio-2.1~56
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=16725bb04ffc0d58af3f1fe91cd58b31961a74f7;p=fio.git

client/server: pass je->rate[] and je->iops[] over the net

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

diff --git a/client.c b/client.c
index ffccc5d4..5dd0a67f 100644
--- a/client.c
+++ b/client.c
@@ -883,6 +883,8 @@ static void convert_jobs_eta(struct jobs_eta *je)
 		je->t_rate[i]	= le32_to_cpu(je->t_rate[i]);
 		je->m_iops[i]	= le32_to_cpu(je->m_iops[i]);
 		je->t_iops[i]	= le32_to_cpu(je->t_iops[i]);
+		je->rate[i]	= le32_to_cpu(je->rate[i]);
+		je->iops[i]	= le32_to_cpu(je->iops[i]);
 	}
 
 	je->elapsed_sec		= le64_to_cpu(je->elapsed_sec);
@@ -906,6 +908,8 @@ void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
 		dst->t_rate[i]	+= je->t_rate[i];
 		dst->m_iops[i]	+= je->m_iops[i];
 		dst->t_iops[i]	+= je->t_iops[i];
+		dst->rate[i]	+= je->rate[i];
+		dst->iops[i]	+= je->iops[i];
 	}
 
 	dst->elapsed_sec	+= je->elapsed_sec;
diff --git a/server.c b/server.c
index 32c1d7a4..f6e4c681 100644
--- a/server.c
+++ b/server.c
@@ -666,6 +666,8 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
 		je->t_rate[i]	= cpu_to_le32(je->t_rate[i]);
 		je->m_iops[i]	= cpu_to_le32(je->m_iops[i]);
 		je->t_iops[i]	= cpu_to_le32(je->t_iops[i]);
+		je->rate[i]	= cpu_to_le32(je->rate[i]);
+		je->iops[i]	= cpu_to_le32(je->iops[i]);
 	}
 
 	je->elapsed_sec		= cpu_to_le64(je->elapsed_sec);