From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 7 Feb 2012 11:27:28 +0000 (+0100)
Subject: stat: NaN fixes
X-Git-Tag: fio-2.0.4~49
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=19d3e967ff31c055c1497dd67f4d7305ec1607f4

stat: NaN fixes

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/stat.c b/stat.c
index 851cc2c0..40e3b1ba 100644
--- a/stat.c
+++ b/stat.c
@@ -440,12 +440,14 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 					ts->percentile_list);
 	}
 	if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
-		double p_of_agg;
+		double p_of_agg = 100.0;
 		const char *bw_str = "KB";
 
-		p_of_agg = mean * 100 / (double) rs->agg[ddir];
-		if (p_of_agg > 100.0)
-			p_of_agg = 100.0;
+		if (rs->agg[dir]) {
+			p_of_agg = mean * 100 / (double) rs->agg[ddir];
+			if (p_of_agg > 100.0)
+				p_of_agg = 100.0;
+		}
 
 		if (mean > 999999.9) {
 			min /= 1000.0;
@@ -653,9 +655,14 @@ static void show_ddir_status_terse(struct thread_stat *ts,
 		free(ovals);
 
 	if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
-		double p_of_agg;
+		double p_of_agg = 100.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;
+		}
 
-		p_of_agg = mean * 100 / (double) rs->agg[ddir];
 		log_info(";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev);
 	} else
 		log_info(";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);