sadf: RAW: Display activity name when showhints option used

"sadf -r -O showhints..." now displays the name for each activity.
Also move the code displaying the number of structures used and allocated
from raw_stats.c to sadf.c.

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

diff --git a/raw_stats.c b/raw_stats.c
index 71e8a43138341feab647ff36c6f66d3ddba87341..c2742b45e27e2684ec2de76eae4026539909f18b 100644 (file)
--- a/raw_stats.c
+++ b/raw_stats.c
@@ -118,10 +118,6 @@ __print_funct_t raw_print_cpu_stats(struct activity *a, char *timestr, int curr)
        int i;
        struct stats_cpu *scc, *scp;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        /* @nr[curr] cannot normally be greater than @nr_ini */
        if (a->nr[curr] > a->nr_ini) {
                a->nr_ini = a->nr[curr];
@@ -241,10 +237,6 @@ __print_funct_t raw_print_irq_stats(struct activity *a, char *timestr, int curr)
        int i;
        struct stats_irq *sic, *sip;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; (i < a->nr[curr]) && (i < a->bitmap->b_size + 1); i++) {
 
                sic = (struct stats_irq *) ((char *) a->buf[curr]  + i * a->msize);
@@ -460,10 +452,6 @@ __print_funct_t raw_print_serial_stats(struct activity *a, char *timestr, int cu
        int i, j, j0, found;
        struct stats_serial *ssc, *ssp;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
 
                found = FALSE;
@@ -537,10 +525,6 @@ __print_funct_t raw_print_disk_stats(struct activity *a, char *timestr, int curr
 
        memset(&sdpzero, 0, STATS_DISK_SIZE);
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
 
                sdc = (struct stats_disk *) ((char *) a->buf[curr] + i * a->msize);
@@ -613,10 +597,6 @@ __print_funct_t raw_print_net_dev_stats(struct activity *a, char *timestr, int c
 
        memset(&sndzero, 0, STATS_NET_DEV_SIZE);
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
 
                sndc = (struct stats_net_dev *) ((char *) a->buf[curr] + i * a->msize);
@@ -670,10 +650,6 @@ __print_funct_t raw_print_net_edev_stats(struct activity *a, char *timestr, int
 
        memset(&snedzero, 0, STATS_NET_EDEV_SIZE);
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
 
                snedc = (struct stats_net_edev *) ((char *) a->buf[curr] + i * a->msize);
@@ -1308,10 +1284,6 @@ __print_funct_t raw_print_pwr_cpufreq_stats(struct activity *a, char *timestr, i
        int i;
        struct stats_pwr_cpufreq *spc;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; (i < a->nr[curr]) && (i < a->bitmap->b_size + 1); i++) {
 
                spc = (struct stats_pwr_cpufreq *) ((char *) a->buf[curr] + i * a->msize);
@@ -1340,10 +1312,6 @@ __print_funct_t raw_print_pwr_fan_stats(struct activity *a, char *timestr, int c
        int i;
        struct stats_pwr_fan *spc;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
                spc = (struct stats_pwr_fan *) ((char *) a->buf[curr] + i * a->msize);
 
@@ -1369,10 +1337,6 @@ __print_funct_t raw_print_pwr_temp_stats(struct activity *a, char *timestr, int
        int i;
        struct stats_pwr_temp *spc;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
                spc = (struct stats_pwr_temp *) ((char *) a->buf[curr] + i * a->msize);
 
@@ -1399,10 +1363,6 @@ __print_funct_t raw_print_pwr_in_stats(struct activity *a, char *timestr, int cu
        int i;
        struct stats_pwr_in *spc;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
                spc = (struct stats_pwr_in *) ((char *) a->buf[curr] + i * a->msize);
 
@@ -1448,10 +1408,6 @@ __print_funct_t raw_print_pwr_wghfreq_stats(struct activity *a, char *timestr, i
        int i, k;
        struct stats_pwr_wghfreq *spc, *spp, *spc_k, *spp_k;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d,%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr2, a->nr_allocated);
-       }
-
        for (i = 0; (i < a->nr[curr]) && (i < a->bitmap->b_size + 1); i++) {
 
                spc = (struct stats_pwr_wghfreq *) ((char *) a->buf[curr]  + i * a->msize * a->nr2);
@@ -1494,10 +1450,6 @@ __print_funct_t raw_print_pwr_usb_stats(struct activity *a, char *timestr, int c
        int i;
        struct stats_pwr_usb *suc;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
                suc = (struct stats_pwr_usb *) ((char *) a->buf[curr] + i * a->msize);
 
@@ -1525,10 +1477,6 @@ __print_funct_t raw_print_filesystem_stats(struct activity *a, char *timestr, in
        int i;
        struct stats_filesystem *sfc;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
                sfc = (struct stats_filesystem *) ((char *) a->buf[curr] + i * a->msize);
 
@@ -1562,10 +1510,6 @@ __print_funct_t raw_print_fchost_stats(struct activity *a, char *timestr, int cu
        int i, j, j0, found;
        struct stats_fchost *sfcc, *sfcp;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; i < a->nr[curr]; i++) {
 
                found = FALSE;
@@ -1626,10 +1570,6 @@ __print_funct_t raw_print_softnet_stats(struct activity *a, char *timestr, int c
        int i;
        struct stats_softnet *ssnc, *ssnp;
 
-       if (DISPLAY_HINTS(flags)) {
-               printf("[NBR: %d/%d (%d)]\n", a->nr[curr], a->nr_ini, a->nr_allocated);
-       }
-
        for (i = 0; (i < a->nr[curr]) && (i < a->bitmap->b_size + 1); i++) {
 
                /*

diff --git a/sadf.c b/sadf.c
index 57d21bc0556a0f364ffb5f34960afd6dd0ae666f..9217c2af79d0f6fe5757f9cda4b7bdd43ea9d9d4 100644 (file)
--- a/sadf.c
+++ b/sadf.c
@@ -686,6 +686,11 @@ int generic_write_stats(int curr, int use_tm_start, int use_tm_end, int reset,
 
                        else if (format == F_RAW_OUTPUT) {
                                /* Raw output */
+                               if (DISPLAY_HINTS(flags)) {
+                                       printf("[%s: %d/%d (%d)]\n", act[i]->name,
+                                              act[i]->nr[curr], act[i]->nr_ini, act[i]->nr_allocated);
+                               }
+
                                (*act[i]->f_raw_print)(act[i], pre, curr);
                        }