linux: cgroup v2-aware Memory & Swap meters

Machine.c

@@ -25,6 +25,8 @@ void Machine_init(Machine* this, UsersTable* usersTable, uid_t userId) {
 
    this->htopUserId = getuid();
 
+   this->containerized = false;
+
    // discover fixed column width limits
    Row_setPidColumnWidth(Platform_getMaxPid());
 

Machine.h

@@ -59,6 +59,8 @@ typedef struct Machine_ {
    unsigned int activeCPUs;
    unsigned int existingCPUs;
 
+   bool containerized; /* whether htop is running inside a container (Linux only; always false elsewhere) */
+
    UsersTable* usersTable;
    uid_t htopUserId;
    uid_t maxUserId;  /* recently observed */

Makefile.am

@@ -188,8 +188,10 @@ linux_platform_headers = \
 	generic/gettime.h \
 	generic/hostname.h \
 	generic/uname.h \
+	linux/CGroupMem.h \
 	linux/CGroupUtils.h \
 	linux/Compat.h \
+	linux/ContainerMeter.h \
 	linux/GPU.h \
 	linux/HugePageMeter.h \
 	linux/IOPriority.h \
@@ -216,8 +218,10 @@ linux_platform_sources = \
 	generic/gettime.c \
 	generic/hostname.c \
 	generic/uname.c \
+	linux/CGroupMem.c \
 	linux/CGroupUtils.c \
 	linux/Compat.c \
+	linux/ContainerMeter.c \
 	linux/GPU.c \
 	linux/HugePageMeter.c \
 	linux/IOPriorityPanel.c \
@@ -527,6 +531,11 @@ coverage:
 cppcheck:
 	cppcheck -q -v . --enable=all -DHAVE_OPENVZ
 
+check_PROGRAMS = linux/CGroupMemTest
+TESTS = $(check_PROGRAMS)
+linux_CGroupMemTest_SOURCES = linux/CGroupMemTest.c linux/CGroupMem.c linux/CGroupMem.h XUtils.c linux/Compat.c
+linux_CGroupMemTest_CPPFLAGS = $(AM_CPPFLAGS) -D_DEFAULT_SOURCE
+
 dist-hook: $(top_distdir)/configure
 	@if test "x$$FORCE_MAKE_DIST" != x || \
 	   grep 'pkg_m4_included' '$(top_distdir)/configure' >/dev/null; then :; \

MemoryMeter.c

@@ -21,7 +21,7 @@ in the source distribution for its full text.
 #include "RichString.h"
 
 
-static const int MemoryMeter_attributes[] = {
+const int MemoryMeter_attributes[] = {
    MEMORY_1,
    MEMORY_2,
    MEMORY_3,
@@ -30,7 +30,7 @@ static const int MemoryMeter_attributes[] = {
    MEMORY_6
 };
 
-static void MemoryMeter_updateValues(Meter* this) {
+void MemoryMeter_updateValuesWith(Meter* this, void (*setValues)(Meter*)) {
    char* buffer = this->txtBuffer;
    size_t size = sizeof(this->txtBuffer);
    int written;
@@ -42,7 +42,7 @@ static void MemoryMeter_updateValues(Meter* this) {
       this->values[memoryClassIdx] = NAN;
    }
 
-   Platform_setMemoryValues(this);
+   setValues(this);
    this->curItems = (uint8_t) Platform_numberOfMemoryClasses;
 
    /* compute the used memory */
@@ -70,7 +70,11 @@ static void MemoryMeter_updateValues(Meter* this) {
    Meter_humanUnit(buffer, this->total, size);
 }
 
-static void MemoryMeter_display(const Object* cast, RichString* out) {
+static void MemoryMeter_updateValues(Meter* this) {
+   MemoryMeter_updateValuesWith(this, Platform_setMemoryValues);
+}
+
+void MemoryMeter_display(const Object* cast, RichString* out) {
    char buffer[50];
    const Meter* this = (const Meter*)cast;
    const Settings* settings = this->host->settings;

MemoryMeter.h

@@ -9,6 +9,9 @@ in the source distribution for its full text.
 */
 
 #include "Meter.h"
+#include "Object.h"
+#include "RichString.h"
+
 
 typedef struct MemoryClass_s {
    const char *label; // e.g. "wired", "shared", "compressed" - platform-specific memory classe names
@@ -19,4 +22,10 @@ typedef struct MemoryClass_s {
 
 extern const MeterClass MemoryMeter_class;
 
+extern const int MemoryMeter_attributes[];
+
+void MemoryMeter_display(const Object* cast, RichString* out);
+
+void MemoryMeter_updateValuesWith(Meter* this, void (*setValues)(Meter*));
+
 #endif

Settings.c

@@ -166,9 +166,14 @@ static void Settings_defaultMeters(Settings* this, const Machine* host) {
       this->hColumns[0].names[0] = xStrdup("AllCPUs");
       this->hColumns[0].modes[0] = BAR_METERMODE;
    }
-   this->hColumns[0].names[1] = xStrdup("Memory");
+   // When containerized, default to the cgroup-aware meters so the limits
+   // imposed on the container are visible. The "Container*" meters fall back
+   // to the host figures when no cgroup limit is in effect.
+   // host->containerized is always false off Linux, so the literal meter
+   // names below are only ever used on a platform that registers them.
+   this->hColumns[0].names[1] = xStrdup(host->containerized ? "ContainerMemory" : "Memory");
    this->hColumns[0].modes[1] = BAR_METERMODE;
-   this->hColumns[0].names[2] = xStrdup("Swap");
+   this->hColumns[0].names[2] = xStrdup(host->containerized ? "ContainerSwap" : "Swap");
    this->hColumns[0].modes[2] = BAR_METERMODE;
    this->hColumns[1].names[r] = xStrdup("Tasks");
    this->hColumns[1].modes[r++] = TEXT_METERMODE;

SwapMeter.c

@@ -19,20 +19,20 @@ in the source distribution for its full text.
 #include "RichString.h"
 
 
-static const int SwapMeter_attributes[] = {
+const int SwapMeter_attributes[] = {
    SWAP,
    SWAP_CACHE,
    SWAP_FRONTSWAP,
 };
 
-static void SwapMeter_updateValues(Meter* this) {
+void SwapMeter_updateValuesWith(Meter* this, void (*setValues)(Meter*)) {
    char* buffer = this->txtBuffer;
    size_t size = sizeof(this->txtBuffer);
    int written;
 
    this->values[SWAP_METER_CACHE] = NAN;   /* 'cached' not present on all platforms */
    this->values[SWAP_METER_FRONTSWAP] = NAN;   /* 'frontswap' not present on all platforms */
-   Platform_setSwapValues(this);
+   setValues(this);
 
    written = Meter_humanUnit(buffer, this->values[SWAP_METER_USED], size);
    METER_BUFFER_CHECK(buffer, size, written);
@@ -42,7 +42,11 @@ static void SwapMeter_updateValues(Meter* this) {
    Meter_humanUnit(buffer, this->total, size);
 }
 
-static void SwapMeter_display(const Object* cast, RichString* out) {
+static void SwapMeter_updateValues(Meter* this) {
+   SwapMeter_updateValuesWith(this, Platform_setSwapValues);
+}
+
+void SwapMeter_display(const Object* cast, RichString* out) {
    char buffer[50];
    const Meter* this = (const Meter*)cast;
    RichString_writeAscii(out, CRT_colors[METER_TEXT], ":");

SwapMeter.h

@@ -8,6 +8,9 @@ in the source distribution for its full text.
 */
 
 #include "Meter.h"
+#include "Object.h"
+#include "RichString.h"
+
 
 typedef enum {
    SWAP_METER_USED = 0,
@@ -18,4 +21,10 @@ typedef enum {
 
 extern const MeterClass SwapMeter_class;
 
+extern const int SwapMeter_attributes[];
+
+void SwapMeter_display(const Object* cast, RichString* out);
+
+void SwapMeter_updateValuesWith(Meter* this, void (*setValues)(Meter*));
+
 #endif