Changeset 252519 in webkit

Timestamp:

Nov 15, 2019 6:34:32 PM (4 years ago)

Author:

basuke.suzuki@sony.com

Message:

[bmalloc] The tracking of freeableMemory of Heap doesn't count Chunk's metadata size.
​https://bugs.webkit.org/show_bug.cgi?id=204135

Reviewed by Yusuke Suzuki.

When chunk is allocated in allocateSmallChunk(), all chunk size is added to freeableMemory.
This is wrong. Only free pages should be added to it.

• bmalloc/Heap.cpp:

(bmalloc::Heap::allocateSmallChunk):

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• bmalloc/Heap.cpp (modified) (2 diffs)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2019-11-15  Basuke Suzuki  <basuke.suzuki@sony.com>
+
+        [bmalloc] The tracking of freeableMemory of Heap doesn't count Chunk's metadata size.
+        https://bugs.webkit.org/show_bug.cgi?id=204135
+
+        Reviewed by Yusuke Suzuki.
+
+        When chunk is allocated in allocateSmallChunk(), all chunk size is added to freeableMemory.
+        This is wrong. Only free pages should be added to it.
+
+        * bmalloc/Heap.cpp:
+        (bmalloc::Heap::allocateSmallChunk):
+
 2019-11-15  Basuke Suzuki  <basuke.suzuki@sony.com>
 

trunk/Source/bmalloc/bmalloc/Heap.cpp

@@ -275 +275 @@
         m_objectTypes.set(chunk, ObjectType::Small);
 
+        size_t accountedInFreeable = 0;
         forEachPage(chunk, pageSize, [&](SmallPage* page) {
             page->setHasPhysicalPages(true);
@@ -282 +283 @@
             page->setHasFreeLines(lock, true);
             chunk->freePages().push(page);
+            accountedInFreeable += pageSize;
         });
 
-        m_freeableMemory += chunkSize;
+        m_freeableMemory += accountedInFreeable;
         
         m_scavenger->schedule(0);