library: the <pids> API now supports 'extra' enum sort

The 'PROCPS_PIDS_extra' enumerator already enjoys some
special place wherein it's zeroed with each iteration.

This patch simply extends the special handling to also
include support for sorting. It will be treated as the
'ull_int' data type, since that encompasses the entire
scope of that union within all pids_result structures.

[ plus, we've also corrected the actual 'extra' name ]

This change was prompted by the conversion of ps which
needs that enumerator to store the former 'pcpu' data,
so it will be available for sorting (not for display).

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

diff --git a/proc/pids.c b/proc/pids.c
index a3229a152c71e0eb9baf59543a61b9d1c6600d0f..be96ec844f03dee85ed677754a2a02026227b9e1 100644 (file)
--- a/proc/pids.c
+++ b/proc/pids.c
@@ -222,7 +222,7 @@ setDECL(VM_USED)      { (void)I; R->result.ul_int = P->vm_swap + P->vm_rss; }
 REG_set(VSIZE_PGS,        ul_int,  vsize)
 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(extra)        { (void)I; (void)R; (void)P; return; }
 setDECL(noop)         { (void)I; (void)R; (void)P; return; }
 setDECL(logical_end)  { (void)I; (void)R; (void)P; return; }
 setDECL(physical_end) { (void)I; (void)R; (void)P; return; }
@@ -468,7 +468,7 @@ static struct {
     { RS(VSIZE_PGS),         f_stat,     NULL,      QS(ul_int),   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(extra),             0,          NULL,      QS(ull_int),  0       },
     { RS(noop),              0,          NULL,      QS(noop),     0       },
     { RS(logical_end),       0,          NULL,      QS(noop),     0       },
     { RS(physical_end),      0,          NULL,      QS(noop),     0       }