Title: [173525] trunk/Source/bmalloc
- Revision
- 173525
- Author
- [email protected]
- Date
- 2014-09-11 12:12:48 -0700 (Thu, 11 Sep 2014)
Log Message
Reviewed by Sam Weinig.
Renamed log => retire for clarity.
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::scavenge):
(bmalloc::Allocator::retire):
(bmalloc::Allocator::allocateMedium):
(bmalloc::Allocator::allocateSlowCase):
(bmalloc::Allocator::log): Deleted.
* bmalloc/Allocator.h:
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (173524 => 173525)
--- trunk/Source/bmalloc/ChangeLog 2014-09-11 19:05:38 UTC (rev 173524)
+++ trunk/Source/bmalloc/ChangeLog 2014-09-11 19:12:48 UTC (rev 173525)
@@ -1,5 +1,19 @@
2014-09-11 Geoffrey Garen <[email protected]>
+ Reviewed by Sam Weinig.
+
+ Renamed log => retire for clarity.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::scavenge):
+ (bmalloc::Allocator::retire):
+ (bmalloc::Allocator::allocateMedium):
+ (bmalloc::Allocator::allocateSlowCase):
+ (bmalloc::Allocator::log): Deleted.
+ * bmalloc/Allocator.h:
+
+2014-09-11 Geoffrey Garen <[email protected]>
+
bmalloc: eager scavenge leaves behind a bogus allocator
https://bugs.webkit.org/show_bug.cgi?id=136743
Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (173524 => 173525)
--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-09-11 19:05:38 UTC (rev 173524)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-09-11 19:12:48 UTC (rev 173525)
@@ -57,17 +57,17 @@
void Allocator::scavenge()
{
for (auto& allocator : m_smallAllocators) {
- log(allocator);
+ retire(allocator);
allocator.clear();
}
processSmallAllocatorLog();
- log(m_mediumAllocator);
+ retire(m_mediumAllocator);
m_mediumAllocator.clear();
processMediumAllocatorLog();
}
-void Allocator::log(SmallAllocator& allocator)
+void Allocator::retire(SmallAllocator& allocator)
{
if (m_smallAllocatorLog.size() == m_smallAllocatorLog.capacity())
processSmallAllocatorLog();
@@ -90,7 +90,7 @@
m_smallAllocatorLog.clear();
}
-void Allocator::log(MediumAllocator& allocator)
+void Allocator::retire(MediumAllocator& allocator)
{
if (m_mediumAllocatorLog.size() == m_mediumAllocatorLog.capacity())
processMediumAllocatorLog();
@@ -136,7 +136,7 @@
if (allocator.allocate(size, object))
return object;
- log(allocator);
+ retire(allocator);
allocator.refill(m_deallocator.allocateMediumLine());
return allocator.allocate(size);
}
@@ -150,7 +150,7 @@
if (size <= smallMax) {
size_t smallSizeClass = smallSizeClassFor(size);
SmallAllocator& allocator = m_smallAllocators[smallSizeClass];
- log(allocator);
+ retire(allocator);
allocator.refill(m_deallocator.allocateSmallLine(smallSizeClass));
return allocator.allocate();
}
Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (173524 => 173525)
--- trunk/Source/bmalloc/bmalloc/Allocator.h 2014-09-11 19:05:38 UTC (rev 173524)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2014-09-11 19:12:48 UTC (rev 173525)
@@ -56,8 +56,8 @@
void* allocateLarge(size_t);
void* allocateXLarge(size_t);
- void log(SmallAllocator&);
- void log(MediumAllocator&);
+ void retire(SmallAllocator&);
+ void retire(MediumAllocator&);
void processSmallAllocatorLog();
void processMediumAllocatorLog();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
