Skip to content

Commit eb253e7

Browse files
authored
Merge pull request #1278 from asurdej-comcast/memory_pressure
MemoryPressureMonitor: Fix cgroup memory statistics
2 parents b371bc5 + c868155 commit eb253e7

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ void CGroupMemoryController::setMemoryControllerPath(CString memoryControllerPat
428428
&& !m_cgroupV2MemoryMaxFile
429429
&& !m_cgroupV2MemoryHighFile
430430
&& !m_cgroupMemoryMemswLimitInBytesFile
431+
&& !m_cgroupMemoryMemswUsageInBytesFile
431432
&& !m_cgroupMemoryLimitInBytesFile
432433
&& !m_cgroupMemoryUsageInBytesFile;
433434
if (shouldFallbackToEmptyPath) {
@@ -436,6 +437,7 @@ void CGroupMemoryController::setMemoryControllerPath(CString memoryControllerPat
436437
m_cgroupV2MemoryMaxFile = getCgroupFile("/", "", CString("memory.max"));
437438
m_cgroupV2MemoryHighFile = getCgroupFile("/", "", CString("memory.high"));
438439
m_cgroupMemoryMemswLimitInBytesFile = getCgroupFile("memory", "", CString("memory.memsw.limit_in_bytes"));
440+
m_cgroupMemoryMemswUsageInBytesFile = getCgroupFile("memory", "", CString("memory.memsw.usage_in_bytes"));
439441
m_cgroupMemoryLimitInBytesFile = getCgroupFile("memory", "", CString("memory.limit_in_bytes"));
440442
m_cgroupMemoryUsageInBytesFile = getCgroupFile("memory", "", CString("memory.usage_in_bytes"));
441443
}

0 commit comments

Comments
 (0)