From d9f2eacbc5b3fccf63b24944ce9a30d762baea3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Wed, 3 Mar 2021 19:48:30 +0100 Subject: [PATCH] Linux: individually show shared memory Shmem: Total memory used by shared memory (shmem) and tmpfs Source: https://www.kernel.org/doc/Documentation/filesystems/proc.txt Closes: #556 --- CRT.c | 6 ++++++ CRT.h | 1 + MemoryMeter.c | 21 +++++++++++++++------ ProcessList.h | 1 + linux/LinuxProcessList.c | 7 ++++++- linux/Platform.c | 3 ++- 6 files changed, 31 insertions(+), 8 deletions(-) diff --git a/CRT.c b/CRT.c index 56e9923f..257da167 100644 --- a/CRT.c +++ b/CRT.c @@ -155,6 +155,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = ColorPair(Blue, Black), [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Blue, Black), [MEMORY_CACHE] = ColorPair(Yellow, Black), + [MEMORY_SHARED] = ColorPair(Magenta, Black), [HUGEPAGE_1] = ColorPair(Green, Black), [HUGEPAGE_2] = ColorPair(Yellow, Black), [HUGEPAGE_3] = ColorPair(Red, Black), @@ -245,6 +246,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = A_NORMAL, [MEMORY_BUFFERS_TEXT] = A_NORMAL, [MEMORY_CACHE] = A_NORMAL, + [MEMORY_SHARED] = A_NORMAL, [HUGEPAGE_1] = A_BOLD, [HUGEPAGE_2] = A_NORMAL, [HUGEPAGE_3] = A_REVERSE | A_BOLD, @@ -335,6 +337,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = ColorPair(Cyan, White), [MEMORY_BUFFERS_TEXT] = ColorPair(Cyan, White), [MEMORY_CACHE] = ColorPair(Yellow, White), + [MEMORY_SHARED] = ColorPair(Magenta, White), [HUGEPAGE_1] = ColorPair(Green, White), [HUGEPAGE_2] = ColorPair(Yellow, White), [HUGEPAGE_3] = ColorPair(Red, White), @@ -425,6 +428,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = ColorPair(Cyan, Black), [MEMORY_BUFFERS_TEXT] = ColorPair(Cyan, Black), [MEMORY_CACHE] = ColorPair(Yellow, Black), + [MEMORY_SHARED] = ColorPair(Magenta, Black), [HUGEPAGE_1] = ColorPair(Green, Black), [HUGEPAGE_2] = ColorPair(Yellow, Black), [HUGEPAGE_3] = ColorPair(Red, Black), @@ -515,6 +519,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = A_BOLD | ColorPair(Cyan, Blue), [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Cyan, Blue), [MEMORY_CACHE] = A_BOLD | ColorPair(Yellow, Blue), + [MEMORY_SHARED] = A_BOLD | ColorPair(Magenta, Blue), [HUGEPAGE_1] = A_BOLD | ColorPair(Green, Blue), [HUGEPAGE_2] = A_BOLD | ColorPair(Yellow, Blue), [HUGEPAGE_3] = A_BOLD | ColorPair(Red, Blue), @@ -605,6 +610,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = ColorPair(Blue, Black), [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Blue, Black), [MEMORY_CACHE] = ColorPair(Yellow, Black), + [MEMORY_SHARED] = ColorPair(Magenta, Black), [HUGEPAGE_1] = ColorPair(Green, Black), [HUGEPAGE_2] = ColorPair(Yellow, Black), [HUGEPAGE_3] = ColorPair(Red, Black), diff --git a/CRT.h b/CRT.h index 91c2b89d..652649e1 100644 --- a/CRT.h +++ b/CRT.h @@ -92,6 +92,7 @@ typedef enum ColorElements_ { MEMORY_BUFFERS, MEMORY_BUFFERS_TEXT, MEMORY_CACHE, + MEMORY_SHARED, HUGEPAGE_1, HUGEPAGE_2, HUGEPAGE_3, diff --git a/MemoryMeter.c b/MemoryMeter.c index 7075f229..0304bb9a 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -18,7 +18,8 @@ in the source distribution for its full text. static const int MemoryMeter_attributes[] = { MEMORY_USED, MEMORY_BUFFERS, - MEMORY_CACHE + MEMORY_CACHE, + MEMORY_SHARED }; static void MemoryMeter_updateValues(Meter* this) { @@ -26,14 +27,15 @@ static void MemoryMeter_updateValues(Meter* this) { size_t size = sizeof(this->txtBuffer); int written; - /* available memory is not supported on all platforms */ + /* shared and available memory are not supported on all platforms */ this->values[3] = NAN; + this->values[4] = NAN; Platform_setMemoryValues(this); /* Do not print available memory in bar mode */ - this->curItems = 3; + this->curItems = 4; - written = Meter_humanUnit(buffer, isnan(this->values[3]) ? this->values[0] : this->total - this->values[3], size); + written = Meter_humanUnit(buffer, isnan(this->values[4]) ? this->values[0] : this->total - this->values[4], size); METER_BUFFER_CHECK(buffer, size, written); METER_BUFFER_APPEND_CHR(buffer, size, '/'); @@ -61,9 +63,16 @@ static void MemoryMeter_display(const Object* cast, RichString* out) { RichString_appendAscii(out, CRT_colors[METER_TEXT], " cache:"); RichString_appendAscii(out, CRT_colors[MEMORY_CACHE], buffer); - /* available memory is not supported on all platforms */ + /* shared memory is not supported on all platforms */ if (!isnan(this->values[3])) { Meter_humanUnit(buffer, this->values[3], sizeof(buffer)); + RichString_appendAscii(out, CRT_colors[METER_TEXT], " shared:"); + RichString_appendAscii(out, CRT_colors[MEMORY_SHARED], buffer); + } + + /* available memory is not supported on all platforms */ + if (!isnan(this->values[4])) { + Meter_humanUnit(buffer, this->values[4], sizeof(buffer)); RichString_appendAscii(out, CRT_colors[METER_TEXT], " available:"); RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer); } @@ -77,7 +86,7 @@ const MeterClass MemoryMeter_class = { }, .updateValues = MemoryMeter_updateValues, .defaultMode = BAR_METERMODE, - .maxItems = 4, + .maxItems = 5, .total = 100.0, .attributes = MemoryMeter_attributes, .name = "Memory", diff --git a/ProcessList.h b/ProcessList.h index a58f8028..d4fd1f60 100644 --- a/ProcessList.h +++ b/ProcessList.h @@ -68,6 +68,7 @@ typedef struct ProcessList_ { memory_t usedMem; memory_t buffersMem; memory_t cachedMem; + memory_t sharedMem; memory_t availableMem; memory_t totalSwap; diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 9eb64173..7d1d6e19 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -1507,6 +1507,7 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) { memory_t totalMem = 0; memory_t buffersMem = 0; memory_t cachedMem = 0; + memory_t sharedMem = 0; memory_t swapTotalMem = 0; memory_t swapCacheMem = 0; memory_t swapFreeMem = 0; @@ -1542,6 +1543,9 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) { break; case 'S': switch (buffer[1]) { + case 'h': + tryRead("Shmem:", sharedMem); + break; case 'w': tryRead("SwapTotal:", swapTotalMem); tryRead("SwapCached:", swapCacheMem); @@ -1565,7 +1569,8 @@ static inline void LinuxProcessList_scanMemoryInfo(ProcessList* this) { */ this->totalMem = totalMem; this->cachedMem = cachedMem + sreclaimableMem; - const memory_t usedDiff = freeMem + cachedMem + sreclaimableMem + buffersMem; + this->sharedMem = sharedMem; + const memory_t usedDiff = freeMem + cachedMem + sreclaimableMem + buffersMem + sharedMem; this->usedMem = (totalMem >= usedDiff) ? totalMem - usedDiff : totalMem - freeMem; this->buffersMem = buffersMem; this->availableMem = availableMem != 0 ? MINIMUM(availableMem, totalMem) : freeMem; diff --git a/linux/Platform.c b/linux/Platform.c index 8a4e27c7..052a29cb 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -287,7 +287,8 @@ void Platform_setMemoryValues(Meter* this) { this->values[0] = pl->usedMem > lpl->totalHugePageMem ? pl->usedMem - lpl->totalHugePageMem : pl->usedMem; this->values[1] = pl->buffersMem; this->values[2] = pl->cachedMem; - this->values[3] = pl->availableMem; + this->values[3] = pl->sharedMem; + this->values[4] = pl->availableMem; if (lpl->zfs.enabled != 0) { this->values[0] -= lpl->zfs.size;