X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=abb1b153e69547dae388ca0421be6646684f9d59;hp=28d85c189f3fc0cf20ceb7dc7b40b4bd5c402cce;hb=bb446c117849b39ece795602774c3716eef6064a;hpb=04a0feae73ca50d05914cc3c425b2a6949523204

diff --git a/stat.c b/stat.c
index 28d85c18..abb1b153 100644
--- a/stat.c
+++ b/stat.c
@@ -82,7 +82,7 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
 	if (n > 1.0)
 		*dev = sqrt(is->S / (n - 1.0));
 	else
-		*dev = -1.0;
+		*dev = 0;
 
 	return 1;
 }
@@ -197,19 +197,33 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
 
 	if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) {
 		const char *base = "(usec)";
+		char *minp, *maxp;
 
 		if (!usec_to_msec(&min, &max, &mean, &dev))
 			base = "(msec)";
 
-		log_info("    slat %s: min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", base, min, max, mean, dev);
+		minp = num2str(min, 6, 1, 0);
+		maxp = num2str(max, 6, 1, 0);
+
+		log_info("    slat %s: min=%s, max=%s, avg=%5.02f, stdev=%5.02f\n", base, minp, maxp, mean, dev);
+
+		free(minp);
+		free(maxp);
 	}
 	if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev)) {
 		const char *base = "(usec)";
+		char *minp, *maxp;
 
 		if (!usec_to_msec(&min, &max, &mean, &dev))
 			base = "(msec)";
 
-		log_info("    clat %s: min=%5lu, max=%5lu, avg=%5.02f, stdev=%5.02f\n", base, min, max, mean, dev);
+		minp = num2str(min, 6, 1, 0);
+		maxp = num2str(max, 6, 1, 0);
+	
+		log_info("    clat %s: min=%s, max=%s, avg=%5.02f, stdev=%5.02f\n", base, minp, maxp, mean, dev);
+
+		free(minp);
+		free(maxp);
 	}
 	if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
 		double p_of_agg;
@@ -228,6 +242,8 @@ static void show_lat(double *io_u_lat, int nr, const char **ranges,
 		if (io_u_lat[i] <= 0.0)
 			continue;
 		if (new_line) {
+			if (line)
+				log_info("\n");
 			log_info("     lat (%s): ", msg);
 			new_line = 0;
 			line = 0;
@@ -239,7 +255,6 @@ static void show_lat(double *io_u_lat, int nr, const char **ranges,
 		if (line == 5)
 			new_line = 1;
 	}
-
 }
 
 static void show_lat_u(double *io_u_lat_u)
@@ -262,6 +277,7 @@ static void show_lat_m(double *io_u_lat_m)
 static void show_latencies(double *io_u_lat_u, double *io_u_lat_m)
 {
 	show_lat_u(io_u_lat_u);
+	log_info("\n");
 	show_lat_m(io_u_lat_m);
 	log_info("\n");
 }