zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

htop shows no used memory in Solaris zone

This commit is contained in:
senjan 2020-09-18 21:37:00 +02:00 committed by cgzones
parent 543286256e
commit 2c933f210b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solaris/SolarisProcessList.c
View File

@ -133,10 +133,10 @@ static inline void SolarisProcessList_scanCPUTime(ProcessList* pl) {
static inline void SolarisProcessList_scanMemoryInfo(ProcessList* pl) { static inline void SolarisProcessList_scanMemoryInfo(ProcessList* pl) {
SolarisProcessList* spl = (SolarisProcessList*) pl; SolarisProcessList* spl = (SolarisProcessList*) pl;
kstat_t *meminfo = NULL; static kstat_t *meminfo = NULL;
int ksrphyserr = -1; int ksrphyserr = -1;
kstat_named_t *totalmem_pgs = NULL; kstat_named_t *totalmem_pgs = NULL;
kstat_named_t *lockedmem_pgs = NULL; kstat_named_t *freemem_pgs = NULL;
kstat_named_t *pages = NULL; kstat_named_t *pages = NULL;
struct swaptable *sl = NULL; struct swaptable *sl = NULL;
struct swapent *swapdev = NULL; struct swapent *swapdev = NULL;
@ -147,15 +147,21 @@ static inline void SolarisProcessList_scanMemoryInfo(ProcessList* pl) {
char *spathbase = NULL; char *spathbase = NULL;
// Part 1 - physical memory // Part 1 - physical memory
if (spl->kd != NULL) { meminfo = kstat_lookup(spl->kd,"unix",0,"system_pages"); } if (spl->kd != NULL && meminfo == NULL) {
// Look up the kstat chain just one, it never changes
meminfo = kstat_lookup(spl->kd,"unix",0,"system_pages");
}
if (meminfo != NULL) { ksrphyserr = kstat_read(spl->kd,meminfo,NULL); } if (meminfo != NULL) { ksrphyserr = kstat_read(spl->kd,meminfo,NULL); }
if (ksrphyserr != -1) { if (ksrphyserr != -1) {
totalmem_pgs = kstat_data_lookup( meminfo, "physmem" ); totalmem_pgs = kstat_data_lookup(meminfo, "physmem");
lockedmem_pgs = kstat_data_lookup( meminfo, "pageslocked" ); freemem_pgs = kstat_data_lookup(meminfo, "freemem");
pages = kstat_data_lookup( meminfo, "pagestotal" ); pages = kstat_data_lookup(meminfo, "pagestotal");
pl->totalMem = totalmem_pgs->value.ui64 * PAGE_SIZE_KB; pl->totalMem = totalmem_pgs->value.ui64 * PAGE_SIZE_KB;
pl->usedMem = lockedmem_pgs->value.ui64 * PAGE_SIZE_KB; if (pl->totalMem > freemem_pgs->value.ui64 * PAGE_SIZE_KB)
pl->usedMem = pl->totalMem - freemem_pgs->value.ui64 * PAGE_SIZE_KB;
else
pl->usedMem = 0; // This can happen in non-global zone (in theory)
// Not sure how to implement this on Solaris - suggestions welcome! // Not sure how to implement this on Solaris - suggestions welcome!
pl->cachedMem = 0; pl->cachedMem = 0;
// Not really "buffers" but the best Solaris analogue that I can find to // Not really "buffers" but the best Solaris analogue that I can find to