Renamed minimum to size in SegregatedFreeList

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

Reviewed by Sam Weinig.

In preparation for supporting aligned allocation.

* bmalloc/SegregatedFreeList.cpp:
(bmalloc::SegregatedFreeList::takeGreedy):
(bmalloc::SegregatedFreeList::take): Every size passed to malloc is
really just a minimum. Let's not imply that this value is special.

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

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index ab11557..acbdb6d 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,17 @@
+2015-01-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Renamed minimum to size in SegregatedFreeList
+        https://bugs.webkit.org/show_bug.cgi?id=140406
+
+        Reviewed by Sam Weinig.
+
+        In preparation for supporting aligned allocation.
+
+        * bmalloc/SegregatedFreeList.cpp:
+        (bmalloc::SegregatedFreeList::takeGreedy):
+        (bmalloc::SegregatedFreeList::take): Every size passed to malloc is
+        really just a minimum. Let's not imply that this value is special.
+
 2015-01-11  Dan Bernstein  <mitz@apple.com>
 
         Geoff is organized, but he is not an organization.

diff --git a/Source/bmalloc/bmalloc/SegregatedFreeList.cpp b/Source/bmalloc/bmalloc/SegregatedFreeList.cpp
index 96d0e84..96d132f 100644 (file)
--- a/Source/bmalloc/bmalloc/SegregatedFreeList.cpp
+++ b/Source/bmalloc/bmalloc/SegregatedFreeList.cpp
@@ -46,10 +46,10 @@ IF_DEBUG(
     list.push(range);
 }
 
-Range SegregatedFreeList::takeGreedy(size_t minimum)
+Range SegregatedFreeList::takeGreedy(size_t size)
 {
     for (size_t i = m_lists.size(); i-- > 0; ) {
-        Range range = takeGreedy(m_lists[i], minimum);
+        Range range = takeGreedy(m_lists[i], size);
         if (!range)
             continue;
 
@@ -58,7 +58,7 @@ Range SegregatedFreeList::takeGreedy(size_t minimum)
     return Range();
 }
 
-Range SegregatedFreeList::takeGreedy(List& list, size_t minimum)
+Range SegregatedFreeList::takeGreedy(List& list, size_t size)
 {
     for (size_t i = list.size(); i-- > 0; ) {
         Range range = list[i];
@@ -71,7 +71,7 @@ Range SegregatedFreeList::takeGreedy(List& list, size_t minimum)
             continue;
         }
 
-        if (range.size() < minimum)
+        if (range.size() < size)
             continue;
 
         list.pop(i);
@@ -81,10 +81,10 @@ Range SegregatedFreeList::takeGreedy(List& list, size_t minimum)
     return Range();
 }
 
-Range SegregatedFreeList::take(size_t minimum)
+Range SegregatedFreeList::take(size_t size)
 {
-    for (auto* list = &select(minimum); list != m_lists.end(); ++list) {
-        Range range = take(*list, minimum);
+    for (auto* list = &select(size); list != m_lists.end(); ++list) {
+        Range range = take(*list, size);
         if (!range)
             continue;
 
@@ -104,7 +104,7 @@ INLINE auto SegregatedFreeList::select(size_t size) -> List&
     return m_lists[result];
 }
 
-INLINE Range SegregatedFreeList::take(List& list, size_t minimum)
+INLINE Range SegregatedFreeList::take(List& list, size_t size)
 {
     Range first;
     size_t end = list.size() > segregatedFreeListSearchDepth ? list.size() - segregatedFreeListSearchDepth : 0;
@@ -119,7 +119,7 @@ INLINE Range SegregatedFreeList::take(List& list, size_t minimum)
             continue;
         }
 
-        if (range.size() < minimum)
+        if (range.size() < size)
             continue;
 
         if (!!first && first < range)