Changeset 67130 in webkit for trunk/JavaScriptCore/jit

Timestamp:

Sep 9, 2010, 5:21:43 PM (15 years ago)

Author:

Stephanie Lewis

Message:

Added statistics sampling and reporting for JavaScriptCore's RegisterFile and ExecutableAllocator classes
​https://bugs.webkit.org/show_bug.cgi?id=45134

Reviewed by Alexey Proskuryakov.

JavaScriptCore:

Added thread-safe committed byte counting and reporting functionality to RegisterFile and
ExecutableAllocator.

• JavaScriptCore.exp:

Exported new symbols to allow for WebKit to get statistics from JavaScriptCore classes.

• interpreter/RegisterFile.cpp:

(JSC::registerFileStatisticsMutex):
Added function which returns a static Mutex used for locking during read/write access to
static committed byte count variable.
(JSC::RegisterFile::~RegisterFile):
Added call to addToStatistics since memory is decommitted here.
(JSC::RegisterFile::releaseExcessCapacity):
Added call to addToStatistics since memory is decommitted here.
(JSC::RegisterFile::initializeThreading):
Added function which calls registerFileStatisticsMutex().
(JSC::RegisterFile::committedByteCount):
Added function which returns the current committed byte count for RegisterFile.
(JSC::RegisterFile::addToCommittedByteCount):
Added function which updates committed byte count.

• interpreter/RegisterFile.h:

(JSC::RegisterFile::RegisterFile):
Added call to addToStatistics since memory is committed here.
(JSC::RegisterFile::grow):
Added call to addToStatistics since memory is committed here.

• jit/ExecutableAllocator.h:

Added function prototype for public static function committedByteCount().

• jit/ExecutableAllocatorFixedVMPool.cpp:

(JSC::FixedVMPoolAllocator::release):
Added call to addToStatistics since memory is decommitted here.
(JSC::FixedVMPoolAllocator::reuse):
Added call to addToStatistics since memory is committed here.
(JSC::FixedVMPoolAllocator::addToCommittedByteCount):
Added function which updates committed byte count.
(JSC::ExecutableAllocator::committedByteCount):
Added function which returns the current committed byte count for ExecutableAllocator.

• runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):
Added call to RegisterFile::initializeThreading.

WebKit/mac:

Added ability to enable new JavaScriptCore statistics sampling and reporting for RegisterFile
and ExecutableAllocator classes. Added reporting of JavaScriptCore's stack committed memory
and JIT code committed memory statistics to WebCoreStatistics memoryStatistics.

• Misc/WebCoreStatistics.mm:

(+[WebCoreStatistics memoryStatistics]):
Added statistics reporting for JSC RegisterFile and ExecutableAllocator.

Location:

trunk/JavaScriptCore/jit

Files:

• ExecutableAllocator.h (modified) (1 diff)
• ExecutableAllocatorFixedVMPool.cpp (modified) (6 diffs)

trunk/JavaScriptCore/jit/ExecutableAllocator.h

@@ -298 +298 @@
     #error "The cacheFlush support is missing on this platform."
 #endif
+    static size_t committedByteCount();
 
 private:

trunk/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

@@ -55 +55 @@
 
 namespace JSC {
+    
+static size_t committedBytesCount = 0;  
+static SpinLock spinlock = SPINLOCK_INITIALIZER;
 
 // FreeListEntry describes a free chunk of memory, stored in the freeList.
@@ -129 +132 @@
     {
         m_allocation.decommit(position, size);
+        addToCommittedByteCount(-static_cast<long>(size));
     }
 
@@ -135 +139 @@
         bool okay = m_allocation.commit(position, size);
         ASSERT_UNUSED(okay, okay);
+        addToCommittedByteCount(static_cast<long>(size));
     }
 
@@ -416 +421 @@
 #endif
 
+    void addToCommittedByteCount(long byteCount)
+    {
+        ASSERT(spinlock.IsHeld());
+        ASSERT(static_cast<long>(committedBytesCount) + byteCount > -1);
+        committedBytesCount += byteCount;
+    }
+
     // Freed space from the most common sized allocations will be held in this list, ...
     const size_t m_commonSize;
@@ -429 +441 @@
 };
 
+size_t ExecutableAllocator::committedByteCount()
+{
+    SpinLockHolder lockHolder(&spinlock);
+    return committedBytesCount;
+}   
+
 void ExecutableAllocator::intializePageSize()
 {
@@ -435 +453 @@
 
 static FixedVMPoolAllocator* allocator = 0;
-static SpinLock spinlock = SPINLOCK_INITIALIZER;
-
+    
 bool ExecutableAllocator::isValid() const
 {