library: exchange <pids> 'addr' for that 'ul_int' type

Work on converting ps has revealed the desirability of
trading a void pointer for that ul_int type. There was
much arithmetic employed against such values and casts
would otherwise have been required. Even pmap needed a
cast on occasions when comparing an internal variable.

Besides, there is much to be said for reducing demands
on (and the complexity of) the result structure union.

[ we choose ul_int over ull_int since that former is ]
[ the exact same size and capacity as a void pointer ]
[ regardless of whether compiled as 32-bit or 64-bit ]

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

diff --git a/proc/pids.c b/proc/pids.c
index 091c2c18ba5b034b79fefe4edcd5cecb041724fa..27786526488de8e91447043935aee7e882058598 100644 (file)
--- a/proc/pids.c
+++ b/proc/pids.c
@@ -93,9 +93,6 @@ struct procps_pidsinfo {
 #define setDECL(e) static void setNAME(e) \
     (struct procps_pidsinfo *I, struct pids_result *R, proc_t *P)
 
-        // value the addr member
-#define ADR_set(e,t,x) setDECL(e) { \
-    (void)I; R->result. t = (void *)P-> x; }
         // convert pages to kib
 #define CVT_set(e,t,x) setDECL(e) { \
     R->result. t = (unsigned long)(P-> x) << I -> pgs2k_shift; }
@@ -115,11 +112,11 @@ struct procps_pidsinfo {
 #define VEC_set(e,x) setDECL(e) { \
     (void)I; R->result.strv = P-> x; P-> x = NULL; }
 
-ADR_set(ADDR_END_CODE,    addr,    end_code)
-ADR_set(ADDR_KSTK_EIP,    addr,    kstk_eip)
-ADR_set(ADDR_KSTK_ESP,    addr,    kstk_esp)
-ADR_set(ADDR_START_CODE,  addr,    start_code)
-ADR_set(ADDR_START_STACK, addr,    start_stack)
+REG_set(ADDR_END_CODE,    ul_int,  end_code)
+REG_set(ADDR_KSTK_EIP,    ul_int,  kstk_eip)
+REG_set(ADDR_KSTK_ESP,    ul_int,  kstk_esp)
+REG_set(ADDR_START_CODE,  ul_int,  start_code)
+REG_set(ADDR_START_STACK, ul_int,  start_stack)
 REG_set(ALARM,            sl_int,  alarm)
 STV_set(CGROUP,                    cgroup)
 VEC_set(CGROUP_V,                  cgroup)
@@ -222,7 +219,7 @@ REG_set(VM_STACK,         ul_int,  vm_stack)
 REG_set(VM_SWAP,          ul_int,  vm_swap)
 setDECL(VM_USED)      { (void)I; R->result.ul_int = P->vm_swap + P->vm_rss; }
 REG_set(VSIZE_PGS,        ul_int,  vsize)
-ADR_set(WCHAN_ADDR,       addr,    wchan)
+REG_set(WCHAN_ADDR,       ul_int,  wchan)
 setDECL(WCHAN_NAME)   { (void)I; R->result.str = strdup(lookup_wchan(P->tid)); }
 setDECL(xtra)         { (void)I; (void)R; (void)P; return; }
 setDECL(noop)         { (void)I; (void)R; (void)P; return; }
@@ -230,7 +227,6 @@ setDECL(logical_end)  { (void)I; (void)R; (void)P; return; }
 setDECL(physical_end) { (void)I; (void)R; (void)P; return; }
 
 #undef setDECL
-#undef ADR_set
 #undef CVT_set
 #undef DUP_set
 #undef REG_set
@@ -282,7 +278,6 @@ NUM_srt(sl_int)
 REG_srt(u_int)
 REG_srt(ul_int)
 REG_srt(ull_int)
-REG_srt(addr)
 
 static int srtNAME(str) (
   const struct pids_stack **A, const struct pids_stack **B, struct sort_parms *P) {
@@ -363,11 +358,11 @@ static struct {
 } Item_table[] = {
 /*    setsfunc               oldflags    freefunc   sortfunc      needhist
       ---------------------  ----------  ---------  ------------  -------- */
-    { RS(ADDR_END_CODE),     f_stat,     NULL,      QS(addr),     0       },
-    { RS(ADDR_KSTK_EIP),     f_stat,     NULL,      QS(addr),     0       },
-    { RS(ADDR_KSTK_ESP),     f_stat,     NULL,      QS(addr),     0       },
-    { RS(ADDR_START_CODE),   f_stat,     NULL,      QS(addr),     0       },
-    { RS(ADDR_START_STACK),  f_stat,     NULL,      QS(addr),     0       },
+    { RS(ADDR_END_CODE),     f_stat,     NULL,      QS(ul_int),   0       },
+    { RS(ADDR_KSTK_EIP),     f_stat,     NULL,      QS(ul_int),   0       },
+    { RS(ADDR_KSTK_ESP),     f_stat,     NULL,      QS(ul_int),   0       },
+    { RS(ADDR_START_CODE),   f_stat,     NULL,      QS(ul_int),   0       },
+    { RS(ADDR_START_STACK),  f_stat,     NULL,      QS(ul_int),   0       },
     { RS(ALARM),             f_stat,     NULL,      QS(sl_int),   0       },
     { RS(CGROUP),            x_cgroup,   FF(str),   QS(str),      0       },
     { RS(CGROUP_V),          v_cgroup,   FF(strv),  QS(strv),     0       },
@@ -470,7 +465,7 @@ static struct {
     { RS(VM_SWAP),           f_status,   NULL,      QS(ul_int),   0       },
     { RS(VM_USED),           f_status,   NULL,      QS(ul_int),   0       },
     { RS(VSIZE_PGS),         f_stat,     NULL,      QS(ul_int),   0       },
-    { RS(WCHAN_ADDR),        f_stat,     NULL,      QS(addr),     0       },
+    { RS(WCHAN_ADDR),        f_stat,     NULL,      QS(ul_int),   0       },
     { RS(WCHAN_NAME),        0,          FF(str),   QS(str),      0       },
     { RS(xtra),              0,          NULL,      QS(noop),     0       },
     { RS(noop),              0,          NULL,      QS(noop),     0       },

diff --git a/proc/pids.h b/proc/pids.h
index 6b5fa76d3ffdebda0d66727f269b9614904d4313..60f8a46acce015c2a914333c0d82ed621c94669e 100644 (file)
--- a/proc/pids.h
+++ b/proc/pids.h
@@ -26,11 +26,11 @@
 __BEGIN_DECLS
 
 enum pids_item {
-    PROCPS_PIDS_ADDR_END_CODE,         // addr
-    PROCPS_PIDS_ADDR_KSTK_EIP,         // addr
-    PROCPS_PIDS_ADDR_KSTK_ESP,         // addr
-    PROCPS_PIDS_ADDR_START_CODE,       // addr
-    PROCPS_PIDS_ADDR_START_STACK,      // addr
+    PROCPS_PIDS_ADDR_END_CODE,         // ul_int
+    PROCPS_PIDS_ADDR_KSTK_EIP,         // ul_int
+    PROCPS_PIDS_ADDR_KSTK_ESP,         // ul_int
+    PROCPS_PIDS_ADDR_START_CODE,       // ul_int
+    PROCPS_PIDS_ADDR_START_STACK,      // ul_int
     PROCPS_PIDS_ALARM,                 // sl_int
     PROCPS_PIDS_CGROUP,                // str
     PROCPS_PIDS_CGROUP_V,              // strv
@@ -133,7 +133,7 @@ enum pids_item {
     PROCPS_PIDS_VM_SWAP,               // ul_int
     PROCPS_PIDS_VM_USED,               // ul_int
     PROCPS_PIDS_VSIZE_PGS,             // ul_int
-    PROCPS_PIDS_WCHAN_ADDR,            // addr
+    PROCPS_PIDS_WCHAN_ADDR,            // ul_int
     PROCPS_PIDS_WCHAN_NAME,            // str
     PROCPS_PIDS_extra,                 //         ( reset to zero )
     PROCPS_PIDS_noop                   //         ( never altered )
@@ -166,7 +166,6 @@ struct pids_result {
         long                 sl_int;
         unsigned long        ul_int;
         unsigned long long   ull_int;
-        void               * addr;
         char               * str;
         char              ** strv;
     } result;