JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / interpreter / RegisterFile.cpp

diff --git a/interpreter/RegisterFile.cpp b/interpreter/RegisterFile.cpp
index 63ea5b371c4e5af90743aa44eed59db63b0fc000..e3b34bb08a40c5b0692c3e23a6b7be0aff0c7f11 100644 (file)
--- a/interpreter/RegisterFile.cpp
+++ b/interpreter/RegisterFile.cpp
@@ -29,48 +29,73 @@
 #include "config.h"
 #include "RegisterFile.h"
 
 #include "config.h"
 #include "RegisterFile.h"
 

+#include "ConservativeRoots.h"
+#include "Interpreter.h"
+#include "JSGlobalData.h"

 #include "JSGlobalObject.h"
 
 namespace JSC {
 
 #include "JSGlobalObject.h"
 
 namespace JSC {
 

+static size_t committedBytesCount = 0;
+
+static Mutex& registerFileStatisticsMutex()
+{
+    DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
+    return staticMutex;
+}    
+    

 RegisterFile::~RegisterFile()
 {
 RegisterFile::~RegisterFile()
 {

-#if HAVE(MMAP)
-    munmap(m_buffer, ((m_max - m_start) + m_maxGlobals) * sizeof(Register));
-#elif HAVE(VIRTUALALLOC)
-#if OS(WINCE)
-    VirtualFree(m_buffer, DWORD(m_commitEnd) - DWORD(m_buffer), MEM_DECOMMIT);
-#endif
-    VirtualFree(m_buffer, 0, MEM_RELEASE);
-#else
-    fastFree(m_buffer);
-#endif
+    void* base = m_reservation.base();
+    m_reservation.decommit(base, reinterpret_cast<intptr_t>(m_commitEnd) - reinterpret_cast<intptr_t>(base));
+    addToCommittedByteCount(-(reinterpret_cast<intptr_t>(m_commitEnd) - reinterpret_cast<intptr_t>(base)));
+    m_reservation.deallocate();
+}
+
+void RegisterFile::gatherConservativeRoots(ConservativeRoots& conservativeRoots)
+{
+    for (Register* it = start(); it != end(); ++it) {
+        JSValue v = it->jsValue();
+        if (!v.isCell())
+            continue;
+        conservativeRoots.add(v.asCell());
+    }

 }
 
 void RegisterFile::releaseExcessCapacity()
 {
 }
 
 void RegisterFile::releaseExcessCapacity()
 {

-#if HAVE(MMAP) && HAVE(MADV_FREE) && !HAVE(VIRTUALALLOC)
-    while (madvise(m_start, (m_max - m_start) * sizeof(Register), MADV_FREE) == -1 && errno == EAGAIN) { }
-#elif HAVE(VIRTUALALLOC)
-    VirtualFree(m_start, (m_max - m_start) * sizeof(Register), MEM_DECOMMIT);
+    m_reservation.decommit(m_start, reinterpret_cast<intptr_t>(m_commitEnd) - reinterpret_cast<intptr_t>(m_start));
+    addToCommittedByteCount(-(reinterpret_cast<intptr_t>(m_commitEnd) - reinterpret_cast<intptr_t>(m_start)));

     m_commitEnd = m_start;
     m_commitEnd = m_start;

-#endif

     m_maxUsed = m_start;
 }
 
 void RegisterFile::setGlobalObject(JSGlobalObject* globalObject)
 {
     m_maxUsed = m_start;
 }
 
 void RegisterFile::setGlobalObject(JSGlobalObject* globalObject)
 {

-    m_globalObject = globalObject;
+    m_globalObject.set(globalObject->globalData(), globalObject, &m_globalObjectOwner, this);

 }
 
 }
 

-bool RegisterFile::clearGlobalObject(JSGlobalObject* globalObject)
+JSGlobalObject* RegisterFile::globalObject()

 {
 {

-    return m_globalObject.clear(globalObject);
+    return m_globalObject.get();

 }
 
 }
 

-JSGlobalObject* RegisterFile::globalObject()
+void RegisterFile::initializeThreading()

 {
 {

-    return m_globalObject.get();
+    registerFileStatisticsMutex();
+}
+
+size_t RegisterFile::committedByteCount()
+{
+    MutexLocker locker(registerFileStatisticsMutex());
+    return committedBytesCount;
+}
+
+void RegisterFile::addToCommittedByteCount(long byteCount)
+{
+    MutexLocker locker(registerFileStatisticsMutex());
+    ASSERT(static_cast<long>(committedBytesCount) + byteCount > -1);
+    committedBytesCount += byteCount;

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC