Changeset 294377 in webkit

Timestamp:

May 17, 2022, 6:42:26 PM (4 years ago)

Author:

basuke.suzuki@sony.com

Message:

[WinCairo] Add memory usage of LibcMalloc category
​https://bugs.webkit.org/show_bug.cgi?id=239660

Reviewed by Ross Kirsling.

WinCairo's memory timeline just displays JavaScript memory usage. Adding
this info shows also Page
memory usage.

• page/win/ResourceUsageThreadWin.cpp:

(WebCore::ResourceUsageThread::platformCollectMemoryData):

Canonical link: ​https://commits.webkit.org/250668@main

File:

• trunk/Source/WebCore/page/win/ResourceUsageThreadWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/page/win/ResourceUsageThreadWin.cpp

@@ -119 +119 @@
 void ResourceUsageThread::platformCollectMemoryData(JSC::VM* vm, ResourceUsageData& data)
 {
-    data.totalDirtySize = memoryUsage();
+    auto usage = data.totalDirtySize = memoryUsage();
 
     size_t currentGCHeapCapacity = vm->heap.blockBytesAllocated();
@@ -130 +130 @@
     data.categories[MemoryCategory::GCOwned].externalSize = currentGCOwnedExternal;
 
+    usage -= currentGCHeapCapacity;
+    // Following ResourceUsageThreadCocoa implementation
+    auto currentGCOwnedGenerallyInMalloc = currentGCOwnedExtra - currentGCOwnedExternal;
+    if (currentGCOwnedGenerallyInMalloc < usage)
+        usage -= currentGCOwnedGenerallyInMalloc;
+
+    data.categories[MemoryCategory::LibcMalloc].dirtySize = usage;
+
     data.totalExternalSize = currentGCOwnedExternal;