From: Jens Axboe <axboe@suse.de>
Date: Tue, 6 Jun 2006 13:38:33 +0000 (+0200)
Subject: [PATCH] Change logging unit from MiB to KiB
X-Git-Tag: fio-1.5~43
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=e9b2a3fa90451c8390f8690f93d55fa0f52bf9d7;hp=573a0b14e2a2891750b3b5b04e8b80867443826a

[PATCH] Change logging unit from MiB to KiB
---

diff --git a/fio.c b/fio.c
index d9f92b09..e5d82055 100644
--- a/fio.c
+++ b/fio.c
@@ -2565,9 +2565,9 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 	printf("\nRun status group %d (all jobs):\n", id);
 
 	if (rs->max_run[DDIR_READ])
-		printf("   READ: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_mb[0], rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
+		printf("   READ: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_kb[0] >> 10, rs->agg[0], rs->min_bw[0], rs->max_bw[0], rs->min_run[0], rs->max_run[0]);
 	if (rs->max_run[DDIR_WRITE])
-		printf("  WRITE: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_mb[1], rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
+		printf("  WRITE: io=%lluMiB, aggrb=%llu, minb=%llu, maxb=%llu, mint=%llumsec, maxt=%llumsec\n", rs->io_kb[1] >> 10, rs->agg[1], rs->min_bw[1], rs->max_bw[1], rs->min_run[1], rs->max_run[1]);
 }
 
 static void show_disk_util(void)
@@ -2643,17 +2643,17 @@ static void show_run_stats(void)
 		if (wbw > rs->max_bw[1])
 			rs->max_bw[1] = wbw;
 
-		rs->io_mb[0] += td->io_bytes[0] >> 20;
-		rs->io_mb[1] += td->io_bytes[1] >> 20;
+		rs->io_kb[0] += td->io_bytes[0] >> 10;
+		rs->io_kb[1] += td->io_bytes[1] >> 10;
 	}
 
 	for (i = 0; i < groupid + 1; i++) {
 		rs = &runstats[i];
 
 		if (rs->max_run[0])
-			rs->agg[0] = (rs->io_mb[0]*1024*1024) / rs->max_run[0];
+			rs->agg[0] = (rs->io_kb[0]*1024) / rs->max_run[0];
 		if (rs->max_run[1])
-			rs->agg[1] = (rs->io_mb[1]*1024*1024) / rs->max_run[1];
+			rs->agg[1] = (rs->io_kb[1]*1024) / rs->max_run[1];
 	}
 
 	/*
diff --git a/fio.h b/fio.h
index 76a114f2..2541c1a0 100644
--- a/fio.h
+++ b/fio.h
@@ -94,7 +94,7 @@ struct verify_header {
 struct group_run_stats {
 	unsigned long long max_run[2], min_run[2];
 	unsigned long long max_bw[2], min_bw[2];
-	unsigned long long io_mb[2];
+	unsigned long long io_kb[2];
 	unsigned long long agg[2];
 };