X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=stat.c;h=fe09a2968e6b4cfea853ef526640fd46eee58faa;hb=44583e022320424d145dbf01d51480e4c9a71126;hp=8bcd566e0b93c6b162b3ed0020f3ecaead4e18ea;hpb=619adf9c5aa472904eec3a62f13030e6b261ea25;p=fio.git

diff --git a/stat.c b/stat.c
index 8bcd566e..fe09a296 100644
--- a/stat.c
+++ b/stat.c
@@ -182,12 +182,12 @@ static unsigned int calc_clat_percentiles(unsigned int *io_u_plat,
  * Find and display the p-th percentile of clat
  */
 static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
-				  fio_fp64_t *plist, uint64_t precision)
+				  fio_fp64_t *plist, unsigned int precision)
 {
 	unsigned int len, j = 0, minv, maxv;
 	unsigned int *ovals;
-	int is_last, scale_down;
-	char buf[32];
+	int is_last, per_line, scale_down;
+	char fmt[32];
 
 	len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
 	if (!len)
@@ -205,13 +205,14 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
 		log_info("    clat percentiles (usec):\n     |");
 	}
 
-	snprintf(buf, sizeof(buf), "%%1.%luf", precision);
+	snprintf(fmt, sizeof(fmt), "%%1.%uf", precision);
+	per_line = (80 - 7) / (precision + 14);
 
 	for (j = 0; j < len; j++) {
 		char fbuf[16], *ptr = fbuf;
 
 		/* for formatting */
-		if (j != 0 && (j % 4) == 0)
+		if (j != 0 && (j % per_line) == 0)
 			log_info("     |");
 
 		/* end of the list */
@@ -220,7 +221,7 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
 		if (plist[j].u.f < 10.0)
 			ptr += sprintf(fbuf, " ");
 
-		snprintf(ptr, sizeof(fbuf), buf, plist[j].u.f);
+		snprintf(ptr, sizeof(fbuf), fmt, plist[j].u.f);
 
 		if (scale_down)
 			ovals[j] = (ovals[j] + 999) / 1000;
@@ -230,7 +231,7 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
 		if (is_last)
 			break;
 
-		if (j % 4 == 3)	/* for formatting */
+		if ((j % per_line) == per_line - 1)	/* for formatting */
 			log_info("\n");
 	}
 
@@ -1357,10 +1358,10 @@ void show_run_stats(void)
 
 	if (is_backend)
 		fio_server_send_du();
-	else if (output_format == FIO_OUTPUT_NORMAL)
+	else if (output_format == FIO_OUTPUT_NORMAL) {
 		show_disk_util(0, NULL);
-
-	show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL);
+		show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL);
+	}
 
 	free(runstats);
 	free(threadstats);