misc: use 'VAL' macros to benefit from type validation

These 2 programs accessed newlib stacks directly which
meant incorrect result type specifications couldn't be
detected using our new result type validation feature.

And, while the usage was correct, to put each on a par
with all of our other programs, they now rely on those
newlib offered VAL macros for accessing stack results.

[ the ps and top programs retain direct stack access ]
[ when assignment to some result struct is necessary ]

[ PIDS_extra is used by top to store the forest view ]
[ level, while ps uses it for cooked cpu percentages ]

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/slabtop.c b/slabtop.c
index eed217b326d5f3d1a0f8e4f39521f82fc098a1b4..7cc6725217718f3765c1eebf4901f1676e10c408 100644 (file)
--- a/slabtop.c
+++ b/slabtop.c
@@ -66,9 +66,9 @@ enum slabinfo_item Node_items[] = {
        thus they need not be represented in the Relative_enums */
     SLABNODE_PAGES_PER_SLAB, SLABNODE_ASLABS };
 
-enum Relative_enums {
-    my_OBJS,  my_AOBJS, my_USE,  my_OSIZE,
-    my_SLABS, my_OPS,   my_SIZE, my_NAME };
+enum Relative_node {
+    nod_OBJS,  nod_AOBJS, nod_USE,  nod_OSIZE,
+    nod_SLABS, nod_OPS,   nod_SIZE, nod_NAME };
 
 #define MAX_ITEMS (int)(sizeof(Node_items) / sizeof(Node_items[0]))
 
@@ -205,6 +205,7 @@ static void parse_opts (int argc, char **argv)
 
 static void print_summary (void)
 {
+ #define totalVAL(e,t) SLABINFO_VAL(e, t, p, Slab_info)
     enum slabinfo_item items[] = {
         SLABS_AOBJS,       SLABS_OBJS,
         SLABS_ASLABS,      SLABS_SLABS,
@@ -213,51 +214,49 @@ static void print_summary (void)
         SLABS_SIZE_MIN,    SLABS_SIZE_AVG,
         SLABS_SIZE_MAX
     };
-    enum slabs_enums {
-        stat_AOBJS,   stat_OBJS,   stat_ASLABS, stat_SLABS,
-        stat_ACACHES, stat_CACHES, stat_ACTIVE, stat_TOTAL,
-        stat_MIN,     stat_AVG,    stat_MAX
+    enum rel_items {
+        tot_AOBJS,   tot_OBJS,   tot_ASLABS, tot_SLABS,
+        tot_ACACHES, tot_CACHES, tot_ACTIVE, tot_TOTAL,
+        tot_MIN,     tot_AVG,    tot_MAX
     };
     struct slabinfo_stack *p;
     struct slabinfo_result *stats;
 
     if (!(p = procps_slabinfo_select(Slab_info, items, MAXTBL(items))))
         xerrx(EXIT_FAILURE, _("Error getting slab summary results"));
-    /* we really should use the provided SLABINFO_VAL macro but,
-       let's do this instead to salvage as much original code as possible ... */
-    stats = p->head;
 
     PRINT_line(" %-35s: %u / %u (%.1f%%)\n"
                , /* Translation Hint: Next five strings must not
                   * exceed a length of 35 characters.  */
                  /* xgettext:no-c-format */
                  _("Active / Total Objects (% used)")
-               , stats[stat_AOBJS].result.u_int
-               , stats[stat_OBJS ].result.u_int
-               , 100.0 * stats[stat_AOBJS].result.u_int / stats[stat_OBJS].result.u_int);
+               , totalVAL(tot_AOBJS, u_int)
+               , totalVAL(tot_OBJS,  u_int)
+               , 100.0 * totalVAL(tot_AOBJS, u_int) / totalVAL(tot_OBJS, u_int));
     PRINT_line(" %-35s: %u / %u (%.1f%%)\n"
                , /* xgettext:no-c-format */
                  _("Active / Total Slabs (% used)")
-               , stats[stat_ASLABS].result.u_int
-               , stats[stat_SLABS  ].result.u_int
-               , 100.0 * stats[stat_ASLABS].result.u_int / stats[stat_SLABS].result.u_int);
+               , totalVAL(tot_ASLABS, u_int)
+               , totalVAL(tot_SLABS,  u_int)
+               , 100.0 * totalVAL(tot_ASLABS, u_int) / totalVAL(tot_SLABS, u_int));
     PRINT_line(" %-35s: %u / %u (%.1f%%)\n"
                , /* xgettext:no-c-format */
                  _("Active / Total Caches (% used)")
-               , stats[stat_ACACHES].result.u_int
-               , stats[stat_CACHES ].result.u_int
-               , 100.0 * stats[stat_ACACHES].result.u_int / stats[stat_CACHES].result.u_int);
+               , totalVAL(tot_ACACHES, u_int)
+               , totalVAL(tot_CACHES,  u_int)
+               , 100.0 * totalVAL(tot_ACACHES, u_int) / totalVAL(tot_CACHES, u_int));
     PRINT_line(" %-35s: %.2fK / %.2fK (%.1f%%)\n"
                , /* xgettext:no-c-format */
                  _("Active / Total Size (% used)")
-               , stats[stat_ACTIVE].result.ul_int / 1024.0
-               , stats[stat_TOTAL ].result.ul_int / 1024.0
-               , 100.0 * stats[stat_ACTIVE].result.ul_int / stats[stat_TOTAL].result.ul_int);
+               , totalVAL(tot_ACTIVE, ul_int) / 1024.0
+               , totalVAL(tot_TOTAL,  ul_int) / 1024.0
+               , 100.0 * totalVAL(tot_ACTIVE, ul_int) / totalVAL(tot_TOTAL, ul_int));
     PRINT_line(" %-35s: %.2fK / %.2fK / %.2fK\n\n"
                , _("Minimum / Average / Maximum Object")
-               , stats[stat_MIN].result.u_int / 1024.0
-               , stats[stat_AVG].result.u_int / 1024.0
-               , stats[stat_MAX].result.u_int / 1024.0);
+               , totalVAL(tot_MIN, u_int) / 1024.0
+               , totalVAL(tot_AVG, u_int) / 1024.0
+               , totalVAL(tot_MAX, u_int) / 1024.0);
+ #undef totalVAL
 }
 
 static void print_headings (void)
@@ -269,17 +268,19 @@ static void print_headings (void)
 
 static void print_details (struct slabinfo_stack *stack)
 {
+ #define nodeVAL(e,t) SLABINFO_VAL(e, t, stack, Slab_info)
     PRINT_line("%6u %6u %3u%% %7.2fK %6u %8u %9luK %-23s\n"
-        , stack->head[my_OBJS ].result.u_int
-        , stack->head[my_AOBJS].result.u_int
-        , stack->head[my_USE  ].result.u_int
-        , stack->head[my_OSIZE].result.u_int / 1024.0
-        , stack->head[my_SLABS].result.u_int
-        , stack->head[my_OPS  ].result.u_int
-        , stack->head[my_SIZE ].result.ul_int / 1024
-        , stack->head[my_NAME ].result.str);
+        , nodeVAL(nod_OBJS,  u_int)
+        , nodeVAL(nod_AOBJS, u_int)
+        , nodeVAL(nod_USE,   u_int)
+        , nodeVAL(nod_OSIZE, u_int) / 1024.0
+        , nodeVAL(nod_SLABS, u_int)
+        , nodeVAL(nod_OPS,   u_int)
+        , nodeVAL(nod_SIZE,  ul_int) / 1024
+        , nodeVAL(nod_NAME,  str));
 
     return;
+ #undef nodeVAL
 }
 
 

diff --git a/vmstat.c b/vmstat.c
index f3b40df4a38d3c1e10a381866db9fa585201a3c0..4713297f4eda3d69165cf5efb1c42510730ab17d 100644 (file)
--- a/vmstat.c
+++ b/vmstat.c
@@ -700,6 +700,7 @@ static void slabheader(void)
 static void slabformat (void)
 {
  #define MAX_ITEMS (int)(sizeof(node_items) / sizeof(node_items[0]))
+ #define slabVAL(e,t) SLABINFO_VAL(e, t, p, slab_info)
     struct slabinfo_info *slab_info;
     struct slabinfo_reap *reaped;
     int i, j;
@@ -727,17 +728,18 @@ static void slabformat (void)
             if (moreheaders && ((j % height) == 0))
                 slabheader();
             printf("%-24.24s %6u %6u %6u %6u\n",
-                p->head[slab_NAME ].result.str,
-                p->head[slab_AOBJS].result.u_int,
-                p->head[slab_OBJS ].result.u_int,
-                p->head[slab_OSIZE].result.u_int,
-                p->head[slab_OPS  ].result.u_int);
+                slabVAL(slab_NAME,  str),
+                slabVAL(slab_AOBJS, u_int),
+                slabVAL(slab_OBJS,  u_int),
+                slabVAL(slab_OSIZE, u_int),
+                slabVAL(slab_OPS,   u_int));
         }
         if (infinite_updates || i+1 < num_updates)
             sleep(sleep_time);
     }
     procps_slabinfo_unref(&slab_info);
  #undef MAX_ITEMS
+ #undef slabVAL
 }
 
 static void disksum_format(void)