Merge branch 'master' into gfio

[fio.git] / eta.c

diff --git a/eta.c b/eta.c
index 531b876280b2176d3784d6d50073d2d47797e146..769ac14370429e07babd4c01fb30027d9c1638e9 100644 (file)
--- a/eta.c
+++ b/eta.c
@@ -319,6 +319,7 @@ int calc_thread_status(struct jobs_eta *je, int force)
                unified_rw_rep += td->o.unified_rw_rep;
                if (is_power_of_2(td->o.kb_base))
                        je->is_pow2 = 1;
+               je->unit_base = td->o.unit_base;
                if (td->o.bw_avg_time < bw_avg_time)
                        bw_avg_time = td->o.bw_avg_time;
                if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING
@@ -449,8 +450,8 @@ void display_thread_status(struct jobs_eta *je)
        if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
                char *tr, *mr;
 
-               mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2);
-               tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2);
+               mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2, 8);
+               tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2, 8);
                p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
                free(tr);
                free(mr);
@@ -477,8 +478,8 @@ void display_thread_status(struct jobs_eta *je)
 
                for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
                        rate_str[ddir] = num2str(je->rate[ddir], 5,
-                                               1024, je->is_pow2);
-                       iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0);
+                                               1024, je->is_pow2, je->unit_base);
+                       iops_str[ddir] = num2str(je->iops[ddir], 4, 1, 0, 0);
                }
 
                left = sizeof(output) - (p - output) - 1;