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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173525 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index 226b086f559dabee7285271f56fdff4126226145..956e91f1a63d83405f5d8370a7604b92235aedd5 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,17 @@
+2014-09-11  Geoffrey Garen  <ggaren@apple.com>
+
+        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  <ggaren@apple.com>
 
         bmalloc: eager scavenge leaves behind a bogus allocator

diff --git a/Source/bmalloc/bmalloc/Allocator.cpp b/Source/bmalloc/bmalloc/Allocator.cpp
index 6d44fa1eb7616ceab151960b2ddef5534be94446..85b7f7e17ba4428bf9670329b3e011c91ea90a90 100644 (file)
--- a/Source/bmalloc/bmalloc/Allocator.cpp
+++ b/Source/bmalloc/bmalloc/Allocator.cpp
@@ -57,17 +57,17 @@ Allocator::~Allocator()
 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 @@ void Allocator::processSmallAllocatorLog()
     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 @@ void* Allocator::allocateMedium(size_t size)
     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_DEBUG(
     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();
     }

diff --git a/Source/bmalloc/bmalloc/Allocator.h b/Source/bmalloc/bmalloc/Allocator.h
index a50e41a3ac809fe47c54af3919cb02befd868ce2..5f111700caf9a260c4999fa0036ca83da964f899 100644 (file)
--- a/Source/bmalloc/bmalloc/Allocator.h
+++ b/Source/bmalloc/bmalloc/Allocator.h
@@ -56,8 +56,8 @@ private:
     void* allocateLarge(size_t);
     void* allocateXLarge(size_t);
     
-    void log(SmallAllocator&);
-    void log(MediumAllocator&);
+    void retire(SmallAllocator&);
+    void retire(MediumAllocator&);
 
     void processSmallAllocatorLog();
     void processMediumAllocatorLog();