Changeset 34886 in webkit for trunk/JavaScriptCore/VM/RegisterFile.h

Timestamp:

Jun 30, 2008, 4:21:43 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Cameron Zwarich.

Make RegisterFile really unmap memory on destruction.

This fixes run-webkit-tests --threaded, which ran out of address space in a few seconds.

• VM/RegisterFile.cpp: (KJS::RegisterFile::~RegisterFile): Unmap all the memory, not just 1/4 of it.

• kjs/JSGlobalObject.h: Don't include RegisterFile.h, so that changes to it don't make half of WebCore rebuild.

• VM/Machine.h: Don't forward declare RegisterFile, as RegisterFile.h is included already.

• VM/RegisterFile.h: (KJS::RegisterFile::RegisterFile): Assert that the allocation succeeded.

File:

• trunk/JavaScriptCore/VM/RegisterFile.h (modified) (2 diffs)

trunk/JavaScriptCore/VM/RegisterFile.h

@@ -121 +121 @@
 #if HAVE(MMAP)
             m_buffer = static_cast<Register*>(mmap(0, bufferLength, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0));
+            ASSERT(reinterpret_cast<intptr_t>(m_buffer) != -1);
 #elif HAVE(VIRTUALALLOC)
             // FIXME: Use VirtualAlloc, and commit pages as we go.
             m_buffer = static_cast<Register*>(fastMalloc(bufferLength));
+            ASSERT(m_buffer);
 #else
             #error "Don't know how to reserve virtual memory on this platform."
@@ -172 +174 @@
     private:
         size_t m_size;
-        size_t m_capacity;
+        const size_t m_capacity;
         size_t m_numGlobals;
-        size_t m_maxGlobals;
+        const size_t m_maxGlobals;
         Register* m_base;
         Register* m_buffer;