Changeset 38849 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 29, 2008, 11:09:50 PM (16 years ago)

Author:

Antti Koivisto

Message:

JavaScriptCore:

2008-11-29 Antti Koivisto <Antti Koivisto>

Reviewed by Dan Bernstein.

​https://bugs.webkit.org/show_bug.cgi?id=22557
Add statistics for JavaScript GC heap.

• JavaScriptCore.exp:
• runtime/Collector.cpp: (JSC::Heap::objectCount): (JSC::addToStatistics): (JSC::Heap::statistics):
• runtime/Collector.h:

WebKit/mac:

2008-11-29 Antti Koivisto <Antti Koivisto>

Reviewed by Dan Bernstein.

​https://bugs.webkit.org/show_bug.cgi?id=22557
Add statistics for JavaScript GC heap.

• Misc/WebCoreStatistics.mm: (+[WebCoreStatistics javaScriptObjectsCount]): (+[WebCoreStatistics memoryStatistics]):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (2 diffs)
• runtime/Collector.cpp (modified) (1 diff)
• runtime/Collector.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-29  Antti Koivisto  <[email protected]>
+
+        Reviewed by Dan Bernstein.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=22557
+        Add statistics for JavaScript GC heap.
+
+        * JavaScriptCore.exp:
+        * runtime/Collector.cpp:
+        (JSC::Heap::objectCount):
+        (JSC::addToStatistics):
+        (JSC::Heap::statistics):
+        * runtime/Collector.h:
+
 2008-11-29  Antti Koivisto  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -170 +170 @@
 __ZN3JSC4Heap26protectedGlobalObjectCountEv
 __ZN3JSC4Heap4heapEPNS_7JSValueE
-__ZN3JSC4Heap4sizeEv
 __ZN3JSC4Heap6isBusyEv
 __ZN3JSC4Heap7collectEv
@@ -177 +176 @@
 __ZN3JSC4Heap8allocateEm
 __ZN3JSC4Heap9unprotectEPNS_7JSValueE
+__ZN3JSC4Heap11objectCountEv
+__ZNK3JSC4Heap10statisticsEv
 __ZN3JSC4callEPNS_9ExecStateEPNS_7JSValueENS_8CallTypeERKNS_8CallDataES3_RKNS_7ArgListE
 __ZN3JSC5equalEPKNS_7UString3RepES3_

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -1005 +1005 @@
 }
 
-size_t Heap::size() 
+size_t Heap::objectCount() 
 {
     return primaryHeap.numLiveObjects + numberHeap.numLiveObjects; 
+}
+
+template <HeapType heapType> 
+static void addToStatistics(Heap::Statistics& statistics, const CollectorHeap& heap)
+{
+    typedef HeapConstants<heapType> HC;
+    for (size_t i = 0; i < heap.usedBlocks; ++i) {
+        if (heap.blocks[i]) {
+            statistics.size += BLOCK_SIZE;
+            statistics.free += (HC::cellsPerBlock - heap.blocks[i]->usedCells) * HC::cellSize;
+        }
+    }
+}
+
+Heap::Statistics Heap::statistics() const
+{
+    Statistics statistics = { 0, 0 };
+    JSC::addToStatistics<PrimaryHeap>(statistics, primaryHeap);
+    JSC::addToStatistics<NumberHeap>(statistics, numberHeap);
+    return statistics;
 }
 

trunk/JavaScriptCore/runtime/Collector.h

@@ -89 +89 @@
         void reportExtraMemoryCost(size_t cost);
 
-        size_t size();
+        size_t objectCount();
+        struct Statistics {
+            size_t size;
+            size_t free;
+        };
+        Statistics statistics() const;
 
         void setGCProtectNeedsLocking();