Changeset 50562 in webkit

Timestamp:

Nov 5, 2009 7:36:14 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-05 Anton Muhin <​antonm@chromium.org>

Reviewed by Adam Barth.

If high memory usage is detected, hint to V8 that it might be due
to external objects retained by V8 objects.
​https://bugs.webkit.org/show_bug.cgi?id=31051

• bindings/v8/V8GCController.cpp: (WebCore::GetMemoryUsageInMB): (WebCore::V8GCController::gcEpilogue): (WebCore::V8GCController::checkMemoryUsage):
• bindings/v8/V8GCController.h:
• bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::evaluate): (WebCore::V8Proxy::runScript): (WebCore::V8Proxy::callFunction):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8GCController.cpp (modified) (3 diffs)
• bindings/v8/V8GCController.h (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-05  Anton Muhin  <antonm@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        If high memory usage is detected, hint to V8 that it might be due
+        to external objects retained by V8 objects.
+        https://bugs.webkit.org/show_bug.cgi?id=31051
+
+        * bindings/v8/V8GCController.cpp:
+        (WebCore::GetMemoryUsageInMB):
+        (WebCore::V8GCController::gcEpilogue):
+        (WebCore::V8GCController::checkMemoryUsage):
+        * bindings/v8/V8GCController.h:
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::evaluate):
+        (WebCore::V8Proxy::runScript):
+        (WebCore::V8Proxy::callFunction):
+
 2009-11-05  Jeff Schiller  <codedread@gmail.com>
 

trunk/WebCore/bindings/v8/V8GCController.cpp

@@ -417 +417 @@
 };
 
+int V8GCController::workingSetEstimateMB = 0;
+
+namespace {
+
+int getMemoryUsageInMB()
+{
+    return ChromiumBridge::memoryUsageMB();
+}
+
+}  // anonymous namespace
+
 void V8GCController::gcEpilogue()
 {
@@ -426 +437 @@
     visitActiveDOMObjectsInCurrentThread(&epilogueVisitor);
 
+    workingSetEstimateMB = getMemoryUsageInMB();
+
 #ifndef NDEBUG
     // Check all survivals are weak.
@@ -439 +452 @@
 }
 
+void V8GCController::checkMemoryUsage()
+{
+    const int lowUsageMB = 256;  // If memory usage is below this threshold, do not bother forcing GC.
+    const int highUsageMB = 1024;  // If memory usage is above this threshold, force GC more aggresively.
+    const int highUsageDeltaMB = 128;  // Delta of memory usage growth (vs. last workingSetEstimateMB) to force GC when memory usage is high.
+
+    int memoryUsageMB = getMemoryUsageInMB();
+    if ((memoryUsageMB > lowUsageMB && memoryUsageMB > 2 * workingSetEstimateMB) || (memoryUsageMB > highUsageMB && memoryUsageMB > workingSetEstimateMB + highUsageDeltaMB))
+        v8::V8::LowMemoryNotification();
+}
+
+
 }  // namespace WebCore

trunk/WebCore/bindings/v8/V8GCController.h

@@ -79 +79 @@
         static void gcPrologue();
         static void gcEpilogue();
+
+        static void checkMemoryUsage();
+
+    private:
+        // Estimate of current working set.
+        static int workingSetEstimateMB;
     };
 

trunk/WebCore/bindings/v8/V8Proxy.cpp

@@ -375 +375 @@
     ASSERT(v8::Context::InContext());
 
+    V8GCController::checkMemoryUsage();
+
 #if ENABLE(INSPECTOR)
     if (InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0)
@@ -419 +421 @@
         return notHandledByInterceptor();
 
+    V8GCController::checkMemoryUsage();
     // Compute the source string and prevent against infinite recursion.
     if (m_recursion >= kMaxRecursionDepth) {
@@ -473 +476 @@
 v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
 {
+    V8GCController::checkMemoryUsage();
     v8::Local<v8::Value> result;
     {