iostat, mpstat: Color enhancements

Display items (device names, CPU number) using color for iostat and
mpstat.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/iostat.c b/iostat.c
index a6b7dba21a9f6d354f90c3899689911b6fdaf1b2..4866880a874b168ce258fa398b4e3b3118b4ebcb 100644 (file)
--- a/iostat.c
+++ b/iostat.c
@@ -954,10 +954,11 @@ void write_ext_stat(int curr, unsigned long long itv, int fctr,
                devname = shi->name;
        }
        if (DISPLAY_HUMAN_READ(flags)) {
-               printf("%s\n%13s", devname, "");
+               cprintf_in(IS_STR, "%s\n", devname, 0);
+               printf("%13s", "");
        }
        else {
-               printf("%-13s", devname);
+               cprintf_in(IS_STR, "%-13s", devname, 0);
        }
 
        /*       rrq/s wrq/s   r/s   w/s  rsec  wsec  rqsz  qusz await r_await w_await svctm %util */
@@ -1014,10 +1015,11 @@ void write_basic_stat(int curr, unsigned long long itv, int fctr,
                devname = shi->name;
        }
        if (DISPLAY_HUMAN_READ(flags)) {
-               printf("%s\n%13s", devname, "");
+               cprintf_in(IS_STR, "%s\n", devname, 0);
+               printf("%13s", "");
        }
        else {
-               printf("%-13s", devname);
+               cprintf_in(IS_STR, "%-13s", devname, 0);
        }
 
        /* Print stats coming from /sys or /proc/diskstats */

diff --git a/mpstat.c b/mpstat.c
index b9e1c4b867e6aa5156ad79157d3064754620d773..d0cb940396a53b3a3b8959b931d3f143549c8ed7 100644 (file)
--- a/mpstat.c
+++ b/mpstat.c
@@ -291,7 +291,8 @@ void write_irqcpu_stats(struct stats_irqcpu *st_ic[], int ic_nr, int dis,
                                continue;
                }
 
-               printf("%-11s  %3d", curr_string, cpu - 1);
+               printf("%-11s", curr_string);
+               cprintf_in(IS_INT, "  %3d", "", cpu - 1);
 
                for (j = 0; j < ic_nr; j++) {
                        p0 = st_ic[curr] + j;   /* irq field set only for proc #0 */
@@ -382,7 +383,8 @@ void write_stats_core(int prev, int curr, int dis,
                /* Check if we want global stats among all proc */
                if (*cpu_bitmap & 1) {
 
-                       printf("%-11s  all", curr_string);
+                       printf("%-11s", curr_string);
+                       cprintf_in(IS_STR, " %s", " all", 0);
 
                        cprintf_pc(10, 7, 2,
                                   (st_cpu[curr]->cpu_user - st_cpu[curr]->cpu_guest) <
@@ -446,7 +448,8 @@ void write_stats_core(int prev, int curr, int dis,
                             scc->cpu_hardirq + scc->cpu_softirq) == 0) {
 
                                if (!DISPLAY_ONLINE_CPU(flags)) {
-                                       printf("%-11s %4d", curr_string, cpu - 1);
+                                       printf("%-11s", curr_string);
+                                       cprintf_in(IS_INT, " %4d", "", cpu - 1);
                                        cprintf_pc(10, 7, 2,
                                                   0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
                                        printf("\n");
@@ -454,7 +457,8 @@ void write_stats_core(int prev, int curr, int dis,
                                continue;
                        }
 
-                       printf("%-11s %4d", curr_string, cpu - 1);
+                       printf("%-11s", curr_string);
+                       cprintf_in(IS_INT, " %4d", "", cpu - 1);
 
                        /* Recalculate itv for current proc */
                        pc_itv = get_per_cpu_interval(scc, scp);
@@ -521,7 +525,8 @@ void write_stats_core(int prev, int curr, int dis,
                }
 
                if (*cpu_bitmap & 1) {
-                       printf("%-11s  all", curr_string);
+                       printf("%-11s", curr_string);
+                       cprintf_in(IS_STR, " %s", " all", 0);
                        cprintf_f(1, 9, 2,
                                  S_VALUE(st_irq[prev]->irq_nr, st_irq[curr]->irq_nr, itv));
                        printf("\n");
@@ -546,14 +551,16 @@ void write_stats_core(int prev, int curr, int dis,
                                /* This is an offline CPU */
 
                                if (!DISPLAY_ONLINE_CPU(flags)) {
-                                       printf("%-11s %4d", curr_string, cpu - 1);
+                                       printf("%-11s", curr_string);
+                                       cprintf_in(IS_INT, " %4d", "", cpu- 1);
                                        cprintf_f(1, 9, 2, 0.0);
                                        printf("\n");
                                }
                                continue;
                        }
 
-                       printf("%-11s %4d", curr_string, cpu - 1);
+                       printf("%-11s", curr_string);
+                       cprintf_in(IS_INT, " %4d", "", cpu- 1);
 
                        /* Recalculate itv for current proc */
                        pc_itv = get_per_cpu_interval(scc, scp);