sadf: Rename option showhints to debug

Rename option showhints (used with sadf's option -O in RAW mode) to
debug since it is mainly used for debugging purpose.

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

diff --git a/raw_stats.c b/raw_stats.c
index 213b255351b5e6693b4f15b754490f0e37f73b41..4e9b9ea408a49a9e4a39b8d4216f517accd79dfe 100644 (file)
--- a/raw_stats.c
+++ b/raw_stats.c
@@ -95,7 +95,7 @@ char *pfield(char *hdr_line, int pos)
 void pval(unsigned long long valp, unsigned long long valc)
 {
        printf("%llu>%llu", valp, valc);
-       if (DISPLAY_HINTS(flags)) {
+       if (DISPLAY_DEBUG_MODE(flags)) {
                if (valc < valp) {
                        /* Field's value has decreased */
                        printf(" [DEC]");
@@ -143,7 +143,7 @@ __print_funct_t raw_print_cpu_stats(struct activity *a, char *timestr, int curr)
                printf("%s %s:%d", timestr,
                       pfield(a->hdr_line, DISPLAY_CPU_ALL(a->opt_flags)), i - 1);
 
-               if (DISPLAY_HINTS(flags) && i) {
+               if (DISPLAY_DEBUG_MODE(flags) && i) {
                        if ((scc->cpu_user + scc->cpu_nice + scc->cpu_sys +
                             scc->cpu_iowait + scc->cpu_idle + scc->cpu_steal +
                             scc->cpu_hardirq + scc->cpu_softirq) == 0) {
@@ -484,7 +484,7 @@ __print_funct_t raw_print_serial_stats(struct activity *a, char *timestr, int cu
                printf("%s %s: %u", timestr, pfield(a->hdr_line, FIRST), ssc->line);
 
                if (!found) {
-                       if (DISPLAY_HINTS(flags)) {
+                       if (DISPLAY_DEBUG_MODE(flags)) {
                                printf(" [NEW]");
                        }
                        printf("\n");
@@ -535,7 +535,7 @@ __print_funct_t raw_print_disk_stats(struct activity *a, char *timestr, int curr
                if (j < 0) {
                        /* This is a newly registered interface. Previous stats are zero */
                        sdp = &sdpzero;
-                       if (DISPLAY_HINTS(flags)) {
+                       if (DISPLAY_DEBUG_MODE(flags)) {
                                printf(" [%s]", j == -1 ? "NEW" : "BCK");
                        }
                }
@@ -607,7 +607,7 @@ __print_funct_t raw_print_net_dev_stats(struct activity *a, char *timestr, int c
                if (j < 0) {
                        /* This is a newly registered interface. Previous stats are zero */
                        sndp = &sndzero;
-                       if (DISPLAY_HINTS(flags)) {
+                       if (DISPLAY_DEBUG_MODE(flags)) {
                                printf(" [%s]", j == -1 ? "NEW" : "BCK");
                        }
                }
@@ -660,7 +660,7 @@ __print_funct_t raw_print_net_edev_stats(struct activity *a, char *timestr, int
                if (j < 0) {
                        /* This is a newly registered interface. Previous stats are zero */
                        snedp = &snedzero;
-                       if (DISPLAY_HINTS(flags)) {
+                       if (DISPLAY_DEBUG_MODE(flags)) {
                                printf(" [%s]", j == -1 ? "NEW" : "BCK");
                        }
                }

diff --git a/sa.h b/sa.h
index 956ebaedb1ffa67365146898f6edbb3232aa9dbd..3b9b1049ddf7f914fd9d78e5818d0dfb7a9c55b7 100644 (file)
--- a/sa.h
+++ b/sa.h
@@ -99,7 +99,7 @@
 #define S_F_PREFD_TIME_OUTPUT  0x00008000
 #define S_F_SVG_SKIP           0x00010000
 /* Same value as S_F_SVG_SKIP above. Used for a different output format */
-#define S_F_RAW_SHOW_HINTS     0x00010000
+#define S_F_RAW_DEBUG_MODE     0x00010000
 #define S_F_SVG_AUTOSCALE      0x00020000
 #define S_F_SVG_ONE_DAY                0x00040000
 #define S_F_SVG_SHOW_IDLE      0x00080000
@@ -126,7 +126,7 @@
 #define PRINT_LOCAL_TIME(m)            (((m) & S_F_LOCAL_TIME)   == S_F_LOCAL_TIME)
 #define USE_PREFD_TIME_OUTPUT(m)       (((m) & S_F_PREFD_TIME_OUTPUT)   == S_F_PREFD_TIME_OUTPUT)
 #define SKIP_EMPTY_VIEWS(m)            (((m) & S_F_SVG_SKIP)     == S_F_SVG_SKIP)
-#define DISPLAY_HINTS(m)               (((m) & S_F_RAW_SHOW_HINTS) == S_F_RAW_SHOW_HINTS)
+#define DISPLAY_DEBUG_MODE(m)          (((m) & S_F_RAW_DEBUG_MODE) == S_F_RAW_DEBUG_MODE)
 #define AUTOSCALE_ON(m)                        (((m) & S_F_SVG_AUTOSCALE) == S_F_SVG_AUTOSCALE)
 #define DISPLAY_ONE_DAY(m)             (((m) & S_F_SVG_ONE_DAY)   == S_F_SVG_ONE_DAY)
 #define DISPLAY_IDLE(m)                        (((m) & S_F_SVG_SHOW_IDLE) == S_F_SVG_SHOW_IDLE)
@@ -216,7 +216,7 @@
 #define K_ONEDAY       "oneday"
 #define K_SHOWIDLE     "showidle"
 #define K_SHOWINFO     "showinfo"
-#define K_SHOWHINTS    "showhints"
+#define K_DEBUG                "debug"
 #define K_HEIGHT       "height="
 #define K_PACKED       "packed"
 

diff --git a/sadf.c b/sadf.c
index 9217c2af79d0f6fe5757f9cda4b7bdd43ea9d9d4..a11b4d5e10f94f17ef52bea7e56db13e3c111ce4 100644 (file)
--- a/sadf.c
+++ b/sadf.c
@@ -686,7 +686,7 @@ 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)) {
+                               if (DISPLAY_DEBUG_MODE(flags)) {
                                        printf("[%s: %d/%d (%d)]\n", act[i]->name,
                                               act[i]->nr[curr], act[i]->nr_ini, act[i]->nr_allocated);
                                }
@@ -1455,8 +1455,8 @@ int main(int argc, char **argv)
                                else if (!strcmp(t, K_SHOWINFO)) {
                                        flags |= S_F_SVG_SHOW_INFO;
                                }
-                               else if (!strcmp(t, K_SHOWHINTS)) {
-                                       flags |= S_F_RAW_SHOW_HINTS;
+                               else if (!strcmp(t, K_DEBUG)) {
+                                       flags |= S_F_RAW_DEBUG_MODE;
                                }
                                else if (!strncmp(t, K_HEIGHT, strlen(K_HEIGHT))) {
                                        v = t + strlen(K_HEIGHT);