[MLton-commit] r6556

[Matthew Fluet]

Change thread-grow-ratio to thread-current-grow ratio.

----------------------------------------------------------------------

U   mlton/trunk/runtime/gc/controls.h
U   mlton/trunk/runtime/gc/init.c
U   mlton/trunk/runtime/gc/stack.c

----------------------------------------------------------------------

Modified: mlton/trunk/runtime/gc/controls.h
===================================================================
--- mlton/trunk/runtime/gc/controls.h	2008-04-07 18:55:24 UTC (rev 6555)
+++ mlton/trunk/runtime/gc/controls.h	2008-04-07 18:55:28 UTC (rev 6556)
@@ -31,7 +31,7 @@
    */
   float nursery; 
   float ramSlop;
-  float threadGrow;
+  float threadCurrentGrow;
   float threadMaxReserved;
   float threadShrink;
 };

Modified: mlton/trunk/runtime/gc/init.c
===================================================================
--- mlton/trunk/runtime/gc/init.c	2008-04-07 18:55:24 UTC (rev 6555)
+++ mlton/trunk/runtime/gc/init.c	2008-04-07 18:55:28 UTC (rev 6556)
@@ -191,13 +191,13 @@
         } else if (0 == strcmp (arg, "stop")) {
           i++;
           s->controls.mayProcessAtMLton = FALSE;
-        } else if (0 == strcmp (arg, "thread-grow-ratio")) {
+        } else if (0 == strcmp (arg, "thread-current-grow-ratio")) {
           i++;
           if (i == argc)
-            die ("@MLton thread-grow-ratio missing argument.");
-          s->controls.ratios.threadGrow = stringToFloat (argv[i++]);
-          unless (1.0 < s->controls.ratios.threadGrow)
-            die ("@MLton thread-grow-ratio argument must greater than 1.0.");
+            die ("@MLton thread-current-grow-ratio missing argument.");
+          s->controls.ratios.threadCurrentGrow = stringToFloat (argv[i++]);
+          unless (1.0 < s->controls.ratios.threadCurrentGrow)
+            die ("@MLton thread-current-grow-ratio argument must greater than 1.0.");
         } else if (0 == strcmp (arg, "thread-max-reserved-ratio")) {
           i++;
           if (i == argc)
@@ -259,7 +259,7 @@
   s->controls.ratios.markCompactGenerational = 8.0;
   s->controls.ratios.nursery = 10.0;
   s->controls.ratios.ramSlop = 0.5;
-  s->controls.ratios.threadGrow = 2.0;
+  s->controls.ratios.threadCurrentGrow = 2.0;
   s->controls.ratios.threadMaxReserved = 4.0;
   s->controls.ratios.threadShrink = 0.5;
   s->controls.summary = FALSE;

Modified: mlton/trunk/runtime/gc/stack.c
===================================================================
--- mlton/trunk/runtime/gc/stack.c	2008-04-07 18:55:24 UTC (rev 6555)
+++ mlton/trunk/runtime/gc/stack.c	2008-04-07 18:55:28 UTC (rev 6556)
@@ -154,7 +154,7 @@
 size_t sizeofStackGrow (GC_state s, GC_stack stack) {
   size_t res;
 
-  res = max ((size_t)(s->controls.ratios.threadGrow * stack->reserved),
+  res = max ((size_t)(s->controls.ratios.threadCurrentGrow * stack->reserved),
              sizeofStackMinimumReserved (s, stack));
   return res;
 }