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 ffccc5d4f54cacb526636a4663c93805df171512..5dd0a67f0dad9670d8e765093dbb367143f4a959 100644 (file)
--- 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 32c1d7a4b389bd3c3cc50ba4a989dd7fc1a8d50c..f6e4c6814a8a481e16c1f89f761190efc76cb69c 100644 (file)
--- 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);