Add real blockdev_size() for FreeBSD

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index c52620d374f01f7c51241a971c018a4722e60914..143325aa1879680e2e09c5a18c13964b57661845 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -635,16 +635,16 @@ void show_run_stats(void)
                max_run[1] = rs->max_run[1];
 
                if (rs->max_run[0])
-                       rs->agg[0] = (rs->io_kb[0] * 1000) / max_run[0];
+                       rs->agg[0] = (rs->io_kb[0] * rs->kb_base) / max_run[0];
                if (rs->max_run[1])
-                       rs->agg[1] = (rs->io_kb[1] * 1000) / max_run[1];
+                       rs->agg[1] = (rs->io_kb[1] * rs->kb_base) / max_run[1];
        }
 
        /*
         * don't overwrite last signal output
         */
        if (!terse_output)
-               printf("\n");
+               log_info("\n");
 
        for (i = 0; i < nr_ts; i++) {
                ts = &threadstats[i];
@@ -752,7 +752,8 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
        if (spent < td->o.bw_avg_time)
                return;
 
-       rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) * 1000 / spent / 1024;
+       rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) *
+                       1000 / spent / 1024;
        add_stat_sample(&ts->bw_stat[ddir], rate);
 
        if (ts->bw_log)