Changeset 119546 in webkit

Timestamp:

Jun 5, 2012 6:37:09 PM (12 years ago)

Author:

Stephanie Lewis

Message:

​https://bugs.webkit.org/show_bug.cgi?id=88370
Memory sampler should trigger low memory signal

Reviewed by Geoff Garen.

Source/WebCore:

No new tests. Verify by running stress test which crashes
in a few minutes without the fix.

Fix assumption in block code. We could get in a state where timer_event_source
had already been released before the block ran.

• platform/mac/MemoryPressureHandlerMac.mm:

(WebCore::MemoryPressureHandler::holdOff):

Source/WebKit2:

Send low memory signal when running the memory sampler. We'd
like to test memory that cannot be freed.

• Shared/WebMemorySampler.cpp:

(WebKit::WebMemorySampler::sampleTimerFired):

• Shared/WebMemorySampler.h:

(WebMemorySampler):

• Shared/mac/WebMemorySampler.mac.mm:

(WebKit):
(WebKit::WebMemorySampler::sendMemoryPressureEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mac/MemoryPressureHandlerMac.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebMemorySampler.cpp (modified) (1 diff)
• WebKit2/Shared/WebMemorySampler.h (modified) (1 diff)
• WebKit2/Shared/mac/WebMemorySampler.mac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-05  Stephanie Lewis  <slewis@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=88370
+        Memory sampler should trigger low memory signal
+
+        Reviewed by Geoff Garen.
+
+        No new tests. Verify by running stress test which crashes 
+        in a few minutes without the fix.
+
+        Fix assumption in block code.  We could get in a state where timer_event_source
+        had already been released before the block ran.
+
+        * platform/mac/MemoryPressureHandlerMac.mm:
+        (WebCore::MemoryPressureHandler::holdOff):
+
 2012-06-05  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm

@@ -107 +107 @@
             dispatch_source_set_timer(_timer_event_source, dispatch_time(DISPATCH_TIME_NOW, seconds * NSEC_PER_SEC), DISPATCH_TIME_FOREVER, 1 * s_minimumHoldOffTime);
             dispatch_source_set_event_handler(_timer_event_source, ^{
-                dispatch_source_cancel(_timer_event_source);
-                dispatch_release(_timer_event_source);
-                _timer_event_source = 0;
+                if (_timer_event_source) {
+                    dispatch_source_cancel(_timer_event_source);
+                    dispatch_release(_timer_event_source);
+                    _timer_event_source = 0;
+                }
                 memoryPressureHandler().install();
             });

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-06-04  Stephanie Lewis  <slewis@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=88370
+        Memory sampler should trigger low memory signal
+
+        Reviewed by Geoff Garen.
+
+        Send low memory signal when running the memory sampler.  We'd
+        like to test memory that cannot be freed.
+
+        * Shared/WebMemorySampler.cpp:
+        (WebKit::WebMemorySampler::sampleTimerFired):
+        * Shared/WebMemorySampler.h:
+        (WebMemorySampler):
+        * Shared/mac/WebMemorySampler.mac.mm:
+        (WebKit):
+        (WebKit::WebMemorySampler::sendMemoryPressureEvent):
+
 2012-06-05  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/WebMemorySampler.cpp

@@ -154 +154 @@
 void WebMemorySampler::sampleTimerFired(Timer<WebMemorySampler>*)
 {
-    appendCurrentMemoryUsageToFile(m_sampleLogFile); 
+    sendMemoryPressureEvent();
+    appendCurrentMemoryUsageToFile(m_sampleLogFile);
 }
 

trunk/Source/WebKit2/Shared/WebMemorySampler.h

@@ -90 +90 @@
     void stopTimerFired(WebCore::Timer<WebMemorySampler>*);
     void appendCurrentMemoryUsageToFile(WebCore::PlatformFileHandle&);
+    void sendMemoryPressureEvent();
     
     SystemMallocStats sampleSystemMalloc() const;

trunk/Source/WebKit2/Shared/mac/WebMemorySampler.mac.mm

@@ -34 +34 @@
 #import <mach/mach_types.h>
 #import <malloc/malloc.h>
+#import <notify.h>
 #import <runtime/JSLock.h>
 #import <WebCore/JSDOMWindow.h>
@@ -176 +177 @@
     return webKitMemoryStats;
 }
-    
+ 
+void WebMemorySampler::sendMemoryPressureEvent()
+{
+    // Free memory that could be released if we needed more.
+    // We want to track memory that cannot.
+    notify_post("org.WebKit.lowMemory");
+}
+
 }