parse: fix spelling error

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index f2b574e9f94e0b2bb5a7e4651cad4c8ec28ecf81..ab2f808b69f825a02c068644d4361a33747b92fd 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -448,8 +448,15 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
                                        ts->percentile_precision);
        }
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
-               double p_of_agg = 100.0;
-               const char *bw_str = "KB";
+               double p_of_agg = 100.0, fkb_base = (double)rs->kb_base;
+               const char *bw_str = (rs->unit_base == 1 ? "Kbit" : "KB");
+
+               if (rs->unit_base == 1) {
+                       min *= 8.0;
+                       max *= 8.0;
+                       mean *= 8.0;
+                       dev *= 8.0;
+               }
 
                if (rs->agg[ddir]) {
                        p_of_agg = mean * 100 / (double) rs->agg[ddir];
@@ -457,15 +464,15 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
                                p_of_agg = 100.0;
                }
 
-               if (mean > 999999.9) {
-                       min /= 1000.0;
-                       max /= 1000.0;
-                       mean /= 1000.0;
-                       dev /= 1000.0;
-                       bw_str = "MB";
+               if (mean > fkb_base * fkb_base) {
+                       min /= fkb_base;
+                       max /= fkb_base;
+                       mean /= fkb_base;
+                       dev /= fkb_base;
+                       bw_str = (rs->unit_base == 1 ? "Mbit" : "MB");
                }
 
-               log_info("    bw (%s/s)  : min=%5lu, max=%5lu, per=%3.2f%%,"
+               log_info("    bw (%-4s/s): min=%5lu, max=%5lu, per=%3.2f%%,"
                         " avg=%5.02f, stdev=%5.02f\n", bw_str, min, max,
                                                        p_of_agg, mean, dev);
        }