Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

[fio.git] / client.c

diff --git a/client.c b/client.c
index ffccc5d4f54cacb526636a4663c93805df171512..eb695ffb5b01df9627224958a5ed7d093d950dcd 100644 (file)
--- a/client.c
+++ b/client.c
@@ -883,13 +883,15 @@ 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);
        je->eta_sec             = le64_to_cpu(je->eta_sec);
        je->nr_threads          = le32_to_cpu(je->nr_threads);
        je->is_pow2             = le32_to_cpu(je->is_pow2);
-       je->unit_base   = le32_to_cpu(je->unit_base);
+       je->unit_base           = le32_to_cpu(je->unit_base);
 }
 
 void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
@@ -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;