sadf: Update functions to display unsigned unsigned long values

Some metrics's type is now unsigned long long instead of unsigned long.
So update functions used by sadf accordingly. Other metrics whose type
remains unsigned long can still be displayed.

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

diff --git a/rndr_stats.c b/rndr_stats.c
index a86ff6a20afb60f1dcc195011c5a1270c054a099..df1b546ebbaea0e2a9ad2e677b7ac922d2c72cca 100644 (file)
--- a/rndr_stats.c
+++ b/rndr_stats.c
@@ -91,7 +91,7 @@ static Cons *cons(tcons t, ...)
  *          pptxt - printf-format text required for ppc output (may be null)
  *          dbtxt - printf-format text required for db output (may be null)
  *          mid - pptxt/dbtxt format args as a Cons.
- *          luval - %lu printable arg (PT_USEINT must be set)
+ *          lluval - %llu printable arg (PT_USEINT must be set)
  *          dval  - %.2f printable arg (used unless PT_USEINT is set)
  *          sval - %s printable arg (PT_USESTR must be set)
  *
@@ -102,7 +102,7 @@ static Cons *cons(tcons t, ...)
  ***************************************************************************
  */
 static void render(int isdb, char *pre, int rflags, const char *pptxt,
-                  const char *dbtxt, Cons *mid, unsigned long int luval,
+                  const char *dbtxt, Cons *mid, unsigned long long lluval,
                   double dval, char *sval)
 {
        static int newline = 1;
@@ -138,7 +138,7 @@ static void render(int isdb, char *pre, int rflags, const char *pptxt,
        }
 
        if (rflags & PT_USEINT) {
-               printf("%s%lu", seps[isdb], luval);
+               printf("%s%llu", seps[isdb], lluval);
        }
        else if (rflags & PT_USESTR) {
                printf("%s%s", seps[isdb], sval);
@@ -1532,27 +1532,27 @@ __print_funct_t render_net_sock_stats(struct activity *a, int isdb, char *pre,
 
        render(isdb, pre, PT_USEINT,
               "-\ttotsck", NULL, NULL,
-              snsc->sock_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->sock_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT,
               "-\ttcpsck", NULL, NULL,
-              snsc->tcp_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->tcp_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT,
               "-\tudpsck",  NULL, NULL,
-              snsc->udp_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->udp_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT,
               "-\trawsck", NULL, NULL,
-              snsc->raw_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->raw_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT,
               "-\tip-frag", NULL, NULL,
-              snsc->frag_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->frag_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT | pt_newlin,
               "-\ttcp-tw", NULL, NULL,
-              snsc->tcp_tw, DNOVAL, NULL);
+              (unsigned long long) snsc->tcp_tw, DNOVAL, NULL);
 }
 
 /*
@@ -2061,19 +2061,19 @@ __print_funct_t render_net_sock6_stats(struct activity *a, int isdb, char *pre,
 
        render(isdb, pre, PT_USEINT,
               "-\ttcp6sck", NULL, NULL,
-              snsc->tcp6_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->tcp6_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT,
               "-\tudp6sck",  NULL, NULL,
-              snsc->udp6_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->udp6_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT,
               "-\traw6sck", NULL, NULL,
-              snsc->raw6_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->raw6_inuse, DNOVAL, NULL);
 
        render(isdb, pre, PT_USEINT | pt_newlin,
               "-\tip6-frag", NULL, NULL,
-              snsc->frag6_inuse, DNOVAL, NULL);
+              (unsigned long long) snsc->frag6_inuse, DNOVAL, NULL);
 }
 
 /*
@@ -2853,7 +2853,7 @@ __print_funct_t render_pwr_usb_stats(struct activity *a, int isdb, char *pre,
                       "bus%d\tmaxpower",
                       NULL,
                       cons(iv, suc->bus_nr, NOVAL),
-                      suc->bmaxpower << 1,
+                      (unsigned long long) (suc->bmaxpower << 1),
                       NOVAL,
                       NULL);
 

diff --git a/svg_stats.c b/svg_stats.c
index b47cee907c5c24c287dca393368239d41531ea85..9e6dcf5381f5680b87aefb94f58879e15b7ab5bc 100644 (file)
--- a/svg_stats.c
+++ b/svg_stats.c
@@ -400,13 +400,13 @@ void lnappend(unsigned long long timetag, double value, char **out, int *outsize
  *             element in array of chars.
  ***************************************************************************
  */
-void lniappend(unsigned long long timetag, unsigned long value, char **out,
+void lniappend(unsigned long long timetag, unsigned long long value, char **out,
               int *outsize, int restart)
 {
        char data[128];
 
        /* Prepare additional graph definition data */
-       snprintf(data, 128, " %c%llu,%lu", restart ? 'M' : 'L', timetag, value);
+       snprintf(data, 128, " %c%llu,%llu", restart ? 'M' : 'L', timetag, value);
        data[127] = '\0';
 
        save_svg_data(data, out, outsize);
@@ -1895,19 +1895,19 @@ __print_funct_t svg_print_ktables_stats(struct activity *a, int curr, int action
                             itv, spmin, spmax, g_fields);
                /* dentunusd */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) skc->dentry_stat,
+                         (unsigned long long) skc->dentry_stat,
                          out, outsize, svg_p->restart);
                /* file-nr */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) skc->file_used,
+                         (unsigned long long) skc->file_used,
                          out + 1, outsize + 1, svg_p->restart);
                /* inode-nr */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) skc->inode_used,
+                         (unsigned long long) skc->inode_used,
                          out + 2, outsize + 2, svg_p->restart);
                /* pty-nr */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) skc->pty_nr,
+                         (unsigned long long) skc->pty_nr,
                          out + 3, outsize + 3, svg_p->restart);
        }
 
@@ -1966,15 +1966,15 @@ __print_funct_t svg_print_queue_stats(struct activity *a, int curr, int action,
                             itv, spmin, spmax, g_fields);
                /* runq-sz */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) sqc->nr_running,
+                         (unsigned long long) sqc->nr_running,
                          out, outsize, svg_p->restart);
                /* blocked */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) sqc->procs_blocked,
+                         (unsigned long long) sqc->procs_blocked,
                          out + 1, outsize + 1, svg_p->restart);
                /* plist-sz */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) sqc->nr_threads,
+                         (unsigned long long) sqc->nr_threads,
                          out + 2, outsize + 2, svg_p->restart);
                /* ldavg-1 */
                lnappend(record_hdr->ust_time - svg_p->ust_time_ref,
@@ -2889,27 +2889,27 @@ __print_funct_t svg_print_net_sock_stats(struct activity *a, int curr, int actio
                             itv, spmin, spmax, g_fields);
                /* totsck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->sock_inuse,
+                         (unsigned long long) snsc->sock_inuse,
                          out, outsize, svg_p->restart);
                /* tcpsck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->tcp_inuse,
+                         (unsigned long long) snsc->tcp_inuse,
                          out + 1, outsize + 1, svg_p->restart);
                /* udpsck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->udp_inuse,
+                         (unsigned long long) snsc->udp_inuse,
                          out + 2, outsize + 2, svg_p->restart);
                /* rawsck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->raw_inuse,
+                         (unsigned long long) snsc->raw_inuse,
                          out + 3, outsize + 3, svg_p->restart);
                /* ip-frag */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->frag_inuse,
+                         (unsigned long long) snsc->frag_inuse,
                          out + 4, outsize + 4, svg_p->restart);
                /* tcp-tw */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->tcp_tw,
+                         (unsigned long long) snsc->tcp_tw,
                          out + 5, outsize + 5, svg_p->restart);
        }
 
@@ -3592,19 +3592,19 @@ __print_funct_t svg_print_net_sock6_stats(struct activity *a, int curr, int acti
                             itv, spmin, spmax, g_fields);
                /* tcp6sck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->tcp6_inuse,
+                         (unsigned long long) snsc->tcp6_inuse,
                          out, outsize, svg_p->restart);
                /* udp6sck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->udp6_inuse,
+                         (unsigned long long) snsc->udp6_inuse,
                          out + 1, outsize + 1, svg_p->restart);
                /* raw6sck */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->raw6_inuse,
+                         (unsigned long long) snsc->raw6_inuse,
                          out + 2, outsize + 2, svg_p->restart);
                /* ip6-frag */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) snsc->frag6_inuse,
+                         (unsigned long long) snsc->frag6_inuse,
                          out + 3, outsize + 3, svg_p->restart);
        }
 
@@ -4541,11 +4541,11 @@ __print_funct_t svg_print_huge_stats(struct activity *a, int curr, int action, s
 
                /* kbhugfree */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) smc->frhkb,
+                         (unsigned long long) smc->frhkb,
                          out, outsize, svg_p->restart);
                /* hugused */
                lniappend(record_hdr->ust_time - svg_p->ust_time_ref,
-                         (unsigned long) smc->tlhkb - smc->frhkb,
+                         (unsigned long long) smc->tlhkb - smc->frhkb,
                          out + 1, outsize + 1, svg_p->restart);
                /* %hugused */
                brappend(record_hdr->ust_time - svg_p->ust_time_ref,