Merge pull request #1310 from asurdej-comcast/mhb

magomez · web-flow · commit 7999b6a584fd · 2024-04-30T10:43:17.000+02:00
Enable MemoryPressureHandler for MALLOC_HEAP_BREAKDOWN
diff --git a/Source/WTF/wtf/MemoryPressureHandler.cpp b/Source/WTF/wtf/MemoryPressureHandler.cpp
@@ -145,11 +145,13 @@ MemoryPressureHandler::MemoryPressureHandler()
 
 void MemoryPressureHandler::setShouldUsePeriodicMemoryMonitor(bool use)
 {
+#if !ENABLE(MALLOC_HEAP_BREAKDOWN)
     if (!isFastMallocEnabled()) {
         // If we're running with FastMalloc disabled, some kind of testing or debugging is probably happening.
         // Let's be nice and not enable the memory kill mechanism.
         return;
     }
+#endif
 
     if (use) {
         m_measurementTimer = makeUnique<RunLoop::Timer<MemoryPressureHandler>>(RunLoop::main(), this, &MemoryPressureHandler::measurementTimerFired);

Original file line number	Diff line number	Diff line change
`@@ -145,11 +145,13 @@ MemoryPressureHandler::MemoryPressureHandler()`
`145`	`145`
`146`	`146`	`void MemoryPressureHandler::setShouldUsePeriodicMemoryMonitor(bool use)`
`147`	`147`	`{`
	`148`	`+#if !ENABLE(MALLOC_HEAP_BREAKDOWN)`
`148`	`149`	`if (!isFastMallocEnabled()) {`
`149`	`150`	`// If we're running with FastMalloc disabled, some kind of testing or debugging is probably happening.`
`150`	`151`	`// Let's be nice and not enable the memory kill mechanism.`
`151`	`152`	`return;`
`152`	`153`	`}`
	`154`	`+#endif`
`153`	`155`
`154`	`156`	`if (use) {`
`155`	`157`	`m_measurementTimer = makeUnique<RunLoop::Timer<MemoryPressureHandler>>(RunLoop::main(), this, &MemoryPressureHandler::measurementTimerFired);`