Changeset 38853 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 30, 2008, 2:19:42 PM (16 years ago)

Author:

Antti Koivisto

Message:

JavaScriptCore:

2008-11-30 Antti Koivisto <Antti Koivisto>

Reviewed by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=22557

Report free size in central and thread caches too.

• wtf/FastMalloc.cpp: (WTF::TCMallocStats::fastMallocStatistics):
• wtf/FastMalloc.h:

WebKit/mac:

2008-11-30 Antti Koivisto <Antti Koivisto>

Reviewed by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=22557

Report free size in central and thread caches too.

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

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (2 diffs)
• wtf/FastMalloc.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-30  Antti Koivisto  <[email protected]>
+
+        Reviewed by Mark Rowe.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=22557
+        
+        Report free size in central and thread caches too.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMallocStats::fastMallocStatistics):
+        * wtf/FastMalloc.h:
+
 2008-11-29  Antti Koivisto  <[email protected]>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -236 +236 @@
 FastMallocStatistics fastMallocStatistics()
 {
-    FastMallocStatistics statistics;
-    statistics.heapSize = 0;
-    statistics.freeSize = 0;
-    statistics.returnedSize = 0;
+    FastMallocStatistics statistics = { 0, 0, 0, 0 };
     return statistics;
 }
@@ -3855 +3852 @@
 FastMallocStatistics fastMallocStatistics()
 {
-    SpinLockHolder h(&pageheap_lock);
-
     FastMallocStatistics statistics;
-    statistics.heapSize = static_cast<size_t>(pageheap->SystemBytes());
-    statistics.freeSize = static_cast<size_t>(pageheap->FreeBytes());
-    statistics.returnedSize = pageheap->ReturnedBytes();
+    {
+        SpinLockHolder lockHolder(&pageheap_lock);
+        statistics.heapSize = static_cast<size_t>(pageheap->SystemBytes());
+        statistics.freeSizeInHeap = static_cast<size_t>(pageheap->FreeBytes());
+        statistics.returnedSize = pageheap->ReturnedBytes();
+        statistics.freeSizeInCaches = 0;
+        for (TCMalloc_ThreadCache* threadCache = thread_heaps; threadCache ; threadCache = threadCache->next_)
+            statistics.freeSizeInCaches += threadCache->Size();
+    }
+    for (unsigned cl = 0; cl < kNumClasses; ++cl) {
+        const int length = central_cache[cl].length();
+        const int tc_length = central_cache[cl].tc_length();
+        statistics.freeSizeInCaches += ByteSizeForClass(cl) * (length + tc_length);
+    }
     return statistics;
 }

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -54 +54 @@
     struct FastMallocStatistics {
         size_t heapSize;
-        size_t freeSize;
+        size_t freeSizeInHeap;
+        size_t freeSizeInCaches;
         size_t returnedSize;
     };