Handle normal output wrapping of the percentile list

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index c523f5c25a605759b055868e07d07d52a5a118fe..28acc233870fea2fa9e29abd8d5664b2101e7b89 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -186,8 +186,8 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
 {
        unsigned int len, j = 0, minv, maxv;
        unsigned int *ovals;
-       int is_last, scale_down;
-       char buf1[32], buf2[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,22 +205,23 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
                log_info("    clat percentiles (usec):\n     |");
        }
 
-       snprintf(buf1, sizeof(buf1), " %%1.%luf", precision);
-       snprintf(buf2, sizeof(buf1), "%%1.%luf", precision);
+       snprintf(fmt, sizeof(fmt), "%%1.%luf", precision);
+       per_line = (80 - 7) / (precision + 14);
+
        for (j = 0; j < len; j++) {
-               char fbuf[16];
+               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 */
                is_last = (j == len - 1);
 
                if (plist[j].u.f < 10.0)
-                       snprintf(fbuf, sizeof(fbuf), buf1, plist[j].u.f);
-               else
-                       snprintf(fbuf, sizeof(fbuf), buf2, plist[j].u.f);
+                       ptr += sprintf(fbuf, " ");
+
+               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");
        }