Changeset 42842 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 24, 2009, 2:53:46 PM (16 years ago)

Author:

[email protected]

Message:

<rdar://problem/6050421> JavaScript register file should remap to release physical pages accumulated during deep recursion

Reviewed by Geoff Garen

We now track the maximum extent of the RegisterFile, and when we reach the final
return from JS (so the stack portion of the registerfile becomes empty) we see
if that extent is greater than maxExcessCapacity. If it is we use madvise or
VirtualFree to release the physical pages that were backing the excess.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/RegisterFile.cpp (modified) (1 diff)
• interpreter/RegisterFile.h (modified) (6 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-04-23  Oliver Hunt  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        <rdar://problem/6050421> JavaScript register file should remap to release physical pages accumulated during deep recursion
+
+        We now track the maximum extent of the RegisterFile, and when we reach the final
+        return from JS (so the stack portion of the registerfile becomes empty) we see
+        if that extent is greater than maxExcessCapacity.  If it is we use madvise or
+        VirtualFree to release the physical pages that were backing the excess.
+
+        * interpreter/RegisterFile.cpp:
+        (JSC::RegisterFile::releaseExcessCapacity):
+        * interpreter/RegisterFile.h:
+        (JSC::RegisterFile::RegisterFile):
+        (JSC::RegisterFile::shrink):
+        (JSC::RegisterFile::grow):
+
 2009-04-23  Mark Rowe  <[email protected]>
 

trunk/JavaScriptCore/interpreter/RegisterFile.cpp

@@ -43 +43 @@
 }
 
+void RegisterFile::releaseExcessCapacity()
+{
+    m_maxUsed = m_start;
+    void* memoryToRelease = reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(reinterpret_cast<char*>(m_start) + commitSize * 2 - 1) & ~(commitSize - 1));
+    ptrdiff_t size = reinterpret_cast<char*>(m_end) - reinterpret_cast<char*>(memoryToRelease);
+#if HAVE(MMAP) && !HAVE(VIRTUALALLOC)
+    while (madvise(memoryToRelease, size, MADV_FREE) == -1 && errno == EAGAIN) { }
+#elif HAVE(VIRTUALALLOC)
+    VirtualFree(memoryToRelease, size, MEM_DECOMMIT);
+    m_commitEnd = memoryToRelease;
+#endif
+}
+
 } // namespace JSC

trunk/JavaScriptCore/interpreter/RegisterFile.h

@@ -115 +115 @@
         static const size_t defaultMaxGlobals = 8192;
         static const size_t commitSize = 1 << 14;
+        // Allow 8k of excess registers before we start trying to reap the registerfile
+        static const ptrdiff_t maxExcessCapacity = 8 * 1024;
 
         RegisterFile(size_t capacity = defaultCapacity, size_t maxGlobals = defaultMaxGlobals);
@@ -139 +141 @@
 
     private:
+        void releaseExcessCapacity();
         size_t m_numGlobals;
         const size_t m_maxGlobals;
@@ -145 +148 @@
         Register* m_max;
         Register* m_buffer;
+        Register* m_maxUsed;
+
 #if HAVE(VIRTUALALLOC)
         Register* m_commitEnd;
@@ -186 +191 @@
         m_start = m_buffer + maxGlobals;
         m_end = m_start;
+        m_maxUsed = m_end;
         m_max = m_start + capacity;
     }
@@ -193 +199 @@
         if (newEnd < m_end)
             m_end = newEnd;
+        if (m_end == m_start && (m_maxUsed - m_start) > maxExcessCapacity) 
+            releaseExcessCapacity();
     }
 
@@ -214 +222 @@
 #endif
 
+        if (newEnd > m_maxUsed)
+            m_maxUsed = newEnd;
+
         m_end = newEnd;
         return true;