Freelistfindlargest() takes a size argument so that the interface matches cbsfindlargest().

New function FreelistFlushToCBS() tries to move all blocks out of a free list and into a CBS.

Copied from Perforce
 Change: 182432
 ServerID: perforce.ravenbrook.com

2 files changed, 45 insertions, 8 deletions

diff --git a/mps/code/freelist.c b/mps/code/freelist.c
index 6db2e7e5d01..47e3904adf2 100644
--- a/mps/code/freelist.c
+++ b/mps/code/freelist.c
@@ -6,6 +6,7 @@
  * .sources: <design/freelist/>.
  */
 
+#include "cbs.h"
 #include "freelist.h"
 #include "mpm.h"
 
@@ -454,10 +455,9 @@ Bool FreelistFindLast(Range rangeReturn, Range oldRangeReturn,
 
 
 Bool FreelistFindLargest(Range rangeReturn, Range oldRangeReturn,
-                         Freelist fl, FindDelete findDelete)
+                         Freelist fl, Size size, FindDelete findDelete)
 {
   Bool found = FALSE;
-  Size size = 0;
   Addr prev, cur, next;
   Addr bestPrev, bestCur;
 
@@ -469,7 +469,7 @@ Bool FreelistFindLargest(Range rangeReturn, Range oldRangeReturn,
   prev = NULL;
   cur = fl->list;
   while (cur) {
-    if (FreelistBlockSize(fl, cur) > size) {
+    if (FreelistBlockSize(fl, cur) >= size) {
       found = TRUE;
       size = FreelistBlockSize(fl, cur);
       bestPrev = prev;
@@ -480,13 +480,11 @@ Bool FreelistFindLargest(Range rangeReturn, Range oldRangeReturn,
     cur = next;
   }
 
-  if (found) {
+  if (found)
     freelistFindDeleteFromBlock(rangeReturn, oldRangeReturn, fl, size,
                                 findDelete, bestPrev, bestCur);
-    return TRUE;
-  }
 
-  return FALSE;
+  return found;
 }
 
 
@@ -536,6 +534,42 @@ Res FreelistDescribe(Freelist fl, mps_lib_FILE *stream)
 }
 
 
+/* freelistFlushIterateMethod -- Iterate method for
+ * FreelistFlushToCBS. Attempst to insert the range into the CBS.
+ */
+static Bool freelistFlushIterateMethod(Bool *deleteReturn, Range range,
+                                       void *closureP, Size closureS)
+{
+  Res res;
+  RangeStruct newRange;
+  CBS cbs;
+
+  AVER(deleteReturn != NULL);
+  AVERT(Range, range);
+  AVER(closureP != NULL);
+  UNUSED(closureS);
+
+  cbs = closureP;
+  res = CBSInsert(&newRange, cbs, range);
+  if (res == ResOK) {
+    *deleteReturn = TRUE;
+    return TRUE;
+  } else {
+    *deleteReturn = FALSE;
+    return FALSE;
+  }
+}
+
+
+void FreelistFlushToCBS(Freelist fl, CBS cbs)
+{
+  AVERT(Freelist, fl);
+  AVERT(CBS, cbs);
+
+  FreelistIterate(fl, freelistFlushIterateMethod, cbs, 0);
+}
+
+
 /* C. COPYRIGHT AND LICENSE
  *
  * Copyright (C) 2013 Ravenbrook Limited <http://www.ravenbrook.com/>.
diff --git a/mps/code/freelist.h b/mps/code/freelist.h
index 97b1d2a6420..b16cf1755e3 100644
--- a/mps/code/freelist.h
+++ b/mps/code/freelist.h
@@ -9,6 +9,7 @@
 #ifndef freelist_h
 #define freelist_h
 
+#include "cbs.h"
 #include "mpmtypes.h"
 #include "range.h"
 
@@ -42,7 +43,9 @@ extern Bool FreelistFindFirst(Range rangeReturn, Range oldRangeReturn,
 extern Bool FreelistFindLast(Range rangeReturn, Range oldRangeReturn,
                              Freelist fl, Size size, FindDelete findDelete);
 extern Bool FreelistFindLargest(Range rangeReturn, Range oldRangeReturn,
-                                Freelist fl, FindDelete findDelete);
+                                Freelist fl, Size size, FindDelete findDelete);
+
+void FreelistFlushToCBS(Freelist fl, CBS cbs);
 
 #endif /* freelist.h */