Revert "[MemoryPressure] MemoryPressureMonitor uses the WPE_RAM_SIZE …

…env var" This reverts commit d188c73.
WebPlatformForEmbedded · Jul 9, 2020 · 686cd2f · 686cd2f
1 parent 6156141
commit 686cd2f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/Source/WTF/wtf/MemoryPressureHandler.cpp b/Source/WTF/wtf/MemoryPressureHandler.cpp
@@ -96,7 +96,7 @@ static size_t thresholdForMemoryKillWithProcessState(WebsamProcessState processS
         baseThreshold = 3 * GB;
 #endif
 
-    return std::min(baseThreshold, static_cast<size_t>(ramSize() * 0.9));
+    return std::min(baseThreshold, static_cast<size_t>(realRamSize() * 0.9));
 }
 
 void MemoryPressureHandler::setPageCount(unsigned pageCount)

diff --git a/Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp b/Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wtf/RAMSize.h>
 #include <wtf/Threading.h>
 #include <wtf/UniStdExtras.h>
 
@@ -191,16 +190,6 @@ static int systemMemoryUsedAsPercentage()
     if (memoryAvailable > memoryTotal)
         return -1;
 
-    if (getenv("WPE_RAM_SIZE")) {
-        // Use custom RAM size.
-        size_t customRAM = ramSize() / KB;
-        if (memoryTotal > customRAM) {
-            size_t memoryReduction = memoryTotal - customRAM;
-            memoryAvailable = memoryAvailable > memoryReduction ? memoryAvailable - memoryReduction : 0;
-            memoryTotal = customRAM;
-        }
-    }
-
     return ((memoryTotal - memoryAvailable) * 100) / memoryTotal;
 }