X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=stat.c;h=4aa9cb8f3d80797fe59deec69dfdcadb29968530;hb=fb9bc6e3ddba81b9455870bbe00e4c60352067a8;hp=b3b2cb35445259dc84b9bfeea81def9a8cdc64e7;hpb=a2c95580b468a1ddd72ecb5532aca7d94f6efa5b;p=fio.git

diff --git a/stat.c b/stat.c
index b3b2cb35..4aa9cb8f 100644
--- a/stat.c
+++ b/stat.c
@@ -475,6 +475,12 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 		else
 			bw_str = "kB";
 
+		if (rs->agg[ddir]) {
+			p_of_agg = mean * 100 / (double) (rs->agg[ddir] / 1024);
+			if (p_of_agg > 100.0)
+				p_of_agg = 100.0;
+		}
+
 		if (rs->unit_base == 1) {
 			min *= 8.0;
 			max *= 8.0;
@@ -482,12 +488,6 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 			dev *= 8.0;
 		}
 
-		if (rs->agg[ddir]) {
-			p_of_agg = mean * 100 / (double) rs->agg[ddir];
-			if (p_of_agg > 100.0)
-				p_of_agg = 100.0;
-		}
-
 		if (mean > fkb_base * fkb_base) {
 			min /= fkb_base;
 			max /= fkb_base;
@@ -497,13 +497,13 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 		}
 
 		log_buf(out, "   bw (%5s/s): min=%5llu, max=%5llu, per=%3.2f%%, "
-			"avg=%5.02f, stdev=%5.02f, samples=%5lu\n",
+			"avg=%5.02f, stdev=%5.02f, samples=%" PRIu64 "\n",
 			bw_str, min, max, p_of_agg, mean, dev,
 			(&ts->bw_stat[ddir])->samples);
 	}
 	if (calc_lat(&ts->iops_stat[ddir], &min, &max, &mean, &dev)) {
-		log_buf(out, "   iops : min=%5llu, max=%5llu, avg=%5.02f, "
-			"stdev=%5.02f, samples=%5lu\n",
+		log_buf(out, "   iops        : min=%5llu, max=%5llu, "
+			"avg=%5.02f, stdev=%5.02f, samples=%" PRIu64 "\n",
 			min, max, mean, dev, (&ts->iops_stat[ddir])->samples);
 	}
 }
@@ -520,7 +520,7 @@ static int show_lat(double *io_u_lat, int nr, const char **ranges,
 		if (new_line) {
 			if (line)
 				log_buf(out, "\n");
-			log_buf(out, "    lat (%s) : ", msg);
+			log_buf(out, "  lat (%s)   : ", msg);
 			new_line = 0;
 			line = 0;
 		}
@@ -924,7 +924,7 @@ static void show_ddir_status_terse(struct thread_stat *ts,
 		double p_of_agg = 100.0;
 
 		if (rs->agg[ddir]) {
-			p_of_agg = mean * 100 / (double) rs->agg[ddir];
+			p_of_agg = mean * 100 / (double) (rs->agg[ddir] / 1024);
 			if (p_of_agg > 100.0)
 				p_of_agg = 100.0;
 		}
@@ -935,12 +935,12 @@ static void show_ddir_status_terse(struct thread_stat *ts,
 
 	if (ver == 5) {
 		if (bw_stat)
-			log_buf(out, ";%lu", (&ts->bw_stat[ddir])->samples);
+			log_buf(out, ";%" PRIu64, (&ts->bw_stat[ddir])->samples);
 		else
 			log_buf(out, ";%lu", 0UL);
 
 		if (calc_lat(&ts->iops_stat[ddir], &min, &max, &mean, &dev))
-			log_buf(out, ";%llu;%llu;%f;%f;%lu", min, max,
+			log_buf(out, ";%llu;%llu;%f;%f;%" PRIu64, min, max,
 				mean, dev, (&ts->iops_stat[ddir])->samples);
 		else
 			log_buf(out, ";%llu;%llu;%f;%f;%lu", 0ULL, 0ULL, 0.0, 0.0, 0UL);
@@ -1055,7 +1055,7 @@ static void add_ddir_status_json(struct thread_stat *ts,
 
 	if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
 		if (rs->agg[ddir]) {
-			p_of_agg = mean * 100 / (double) rs->agg[ddir];
+			p_of_agg = mean * 100 / (double) (rs->agg[ddir] / 1024);
 			if (p_of_agg > 100.0)
 				p_of_agg = 100.0;
 		}