SCB_NUMx(PID, tid)
SCB_NUMx(PPD, ppid)
SCB_NUMx(PRI, priority)
-SCB_NUM1(RES, resident) // also serves MEM !
+SCB_NUM1(RES, vm_rss) // also serves MEM !
SCB_STRX(SGD, supgid)
SCB_STRS(SGN, supgrp)
SCB_NUM1(SHR, share)
SCB_NUMx(URD, ruid)
SCB_STRS(URN, ruser)
SCB_NUMx(USD, suid)
-SCB_NUM2(USE, resident, vm_swap)
+SCB_NUM2(USE, vm_rss, vm_swap)
SCB_STRS(USN, suser)
SCB_NUM1(VRT, size)
SCB_NUM1(WCH, wchan)
#define L_OUSER PROC_FILLSTATUS | PROC_FILLUSR
#define L_EGROUP PROC_FILLSTATUS | PROC_FILLGRP
#define L_SUPGRP PROC_FILLSTATUS | PROC_FILLSUPGRP
-#define L_USED PROC_FILLSTATUS | PROC_FILLMEM
#define L_NS PROC_FILLNS
#define L_LXC PROC_FILL_LXC
// make 'none' non-zero (used to be important to Frames_libflags)
{ 6, -1, A_right, SF(TME), L_stat },
{ 9, -1, A_right, SF(TME), L_stat }, // EU_TM2 slot
#ifdef BOOST_PERCNT
- { 5, -1, A_right, SF(RES), L_statm }, // EU_MEM slot
+ { 5, -1, A_right, SF(RES), L_status }, // EU_MEM slot
#else
- { 4, -1, A_right, SF(RES), L_statm }, // EU_MEM slot
+ { 4, -1, A_right, SF(RES), L_status }, // EU_MEM slot
#endif
#ifndef NOBOOST_MEMS
{ 7, SK_Kb, A_right, SF(VRT), L_statm },
{ 6, SK_Kb, A_right, SF(SWP), L_status },
- { 6, SK_Kb, A_right, SF(RES), L_statm },
+ { 6, SK_Kb, A_right, SF(RES), L_status },
{ 6, SK_Kb, A_right, SF(COD), L_statm },
{ 7, SK_Kb, A_right, SF(DAT), L_statm },
{ 6, SK_Kb, A_right, SF(SHR), L_statm },
#else
{ 5, SK_Kb, A_right, SF(VRT), L_statm },
{ 4, SK_Kb, A_right, SF(SWP), L_status },
- { 4, SK_Kb, A_right, SF(RES), L_statm },
+ { 4, SK_Kb, A_right, SF(RES), L_status },
{ 4, SK_Kb, A_right, SF(COD), L_statm },
{ 5, SK_Kb, A_right, SF(DAT), L_statm },
{ 4, SK_Kb, A_right, SF(SHR), L_statm },
{ 3, -1, A_right, SF(FV1), L_stat },
{ 3, -1, A_right, SF(FV2), L_stat },
#ifndef NOBOOST_MEMS
- { 6, SK_Kb, A_right, SF(USE), L_USED },
+ { 6, SK_Kb, A_right, SF(USE), L_status },
#else
- { 4, SK_Kb, A_right, SF(USE), L_USED },
+ { 4, SK_Kb, A_right, SF(USE), L_status },
#endif
{ 10, -1, A_right, SF(NS1), L_NS }, // IPCNS
{ 10, -1, A_right, SF(NS2), L_NS }, // MNTNS
cp = make_str(p->lxcname, W, Js, EU_LXC);
break;
case EU_MEM:
- cp = scale_pcnt((float)pages2K(p->resident) * 100 / MEM_VAL(mem_TOTAL), W, Jn);
+ cp = scale_pcnt((float)p->vm_rss * 100 / MEM_VAL(mem_TOTAL), W, Jn);
break;
case EU_NCE:
cp = make_num(p->nice, W, Jn, AUTOX_NO);
cp = make_num(p->priority, W, Jn, AUTOX_NO);
break;
case EU_RES:
- cp = scale_mem(S, pages2K(p->resident), W, Jn);
+ cp = scale_mem(S, p->vm_rss, W, Jn);
break;
case EU_SGD:
makeVAR(p->supgid);
cp = make_num(p->suid, W, Jn, EU_USD);
break;
case EU_USE:
- cp = scale_mem(S, (p->vm_swap + pages2K(p->resident)), W, Jn);
+ cp = scale_mem(S, (p->vm_swap + p->vm_rss), W, Jn);
break;
case EU_USN:
cp = make_str(p->suser, W, Js, EU_USN);