[MLton-commit] r7442

[Matthew Fluet]

More tweaks to GC messages.
----------------------------------------------------------------------

U   mlton/trunk/runtime/gc/garbage-collection.c
U   mlton/trunk/runtime/gc/translate.c

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

Modified: mlton/trunk/runtime/gc/garbage-collection.c
===================================================================
--- mlton/trunk/runtime/gc/garbage-collection.c	2010-03-17 20:57:27 UTC (rev 7441)
+++ mlton/trunk/runtime/gc/garbage-collection.c	2010-03-17 20:57:30 UTC (rev 7442)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Matthew Fluet.
+/* Copyright (C) 2009-2010 Matthew Fluet.
  * Copyright (C) 1999-2008 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
@@ -117,14 +117,14 @@
              uintmaxToCommaString(s->heap.size),
              uintmaxToCommaString(s->heap.withMapsSize - s->heap.size));
     fprintf (stderr, 
-             "[GC:\twith nursery of size %s bytes (%.1f%% of heap),]\n",
+             "[GC:\twith old-gen of size %s bytes (%.1f%% of heap),]\n",
+             uintmaxToCommaString(s->heap.oldGenSize),
+             100.0 * ((double)(s->heap.oldGenSize) / (double)(s->heap.size)));
+    fprintf (stderr,
+             "[GC:\tand nursery of size %s bytes (%.1f%% of heap),]\n",
              uintmaxToCommaString(nurserySize),
              100.0 * ((double)(nurserySize) / (double)(s->heap.size)));
-    fprintf (stderr, 
-             "[GC:\tand old-gen of size %s bytes (%.1f%% of heap),]\n",
-             uintmaxToCommaString(s->heap.oldGenSize),
-             100.0 * ((double)(s->heap.oldGenSize) / (double)(s->heap.size)));
-    fprintf (stderr, 
+    fprintf (stderr,
              "[GC:\tand nursery using %s bytes (%.1f%% of heap, %.1f%% of nursery).]\n",
              uintmaxToCommaString(nurseryUsed),
              100.0 * ((double)(nurseryUsed) / (double)(s->heap.size)),
@@ -171,13 +171,13 @@
              uintmaxToCommaString(s->heap.size),
              uintmaxToCommaString(s->heap.withMapsSize - s->heap.size));
     fprintf (stderr, 
-             "[GC:\twith nursery of size %s bytes (%.1f%% of heap),]\n",
+             "[GC:\twith old-gen of size %s bytes (%.1f%% of heap),]\n",
+             uintmaxToCommaString(s->heap.oldGenSize),
+             100.0 * ((double)(s->heap.oldGenSize) / (double)(s->heap.size)));
+    fprintf (stderr,
+             "[GC:\tand nursery of size %s bytes (%.1f%% of heap).]\n",
              uintmaxToCommaString(nurserySize),
              100.0 * ((double)(nurserySize) / (double)(s->heap.size)));
-    fprintf (stderr, 
-             "[GC:\tand old-gen of size %s bytes (%.1f%% of heap).]\n",
-             uintmaxToCommaString(s->heap.oldGenSize),
-             100.0 * ((double)(s->heap.oldGenSize) / (double)(s->heap.size)));
   }
   /* Send a GC signal. */
   if (s->signalsInfo.gcSignalHandled

Modified: mlton/trunk/runtime/gc/translate.c
===================================================================
--- mlton/trunk/runtime/gc/translate.c	2010-03-17 20:57:27 UTC (rev 7441)
+++ mlton/trunk/runtime/gc/translate.c	2010-03-17 20:57:30 UTC (rev 7442)
@@ -1,4 +1,5 @@
-/* Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
+/* Copyright (C) 2010 Matthew Fluet.
+ * Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
  *
@@ -32,9 +33,9 @@
 
   if (DEBUG or s->controls.messages)
     fprintf (stderr, 
-             "[GC: Translating heap at "FMTPTR" of size %s bytes from "FMTPTR".]\n",
+             "[GC: Translating old-gen of size %s bytes of heap at "FMTPTR" from "FMTPTR".]\n",
+             uintmaxToCommaString(size),
              (uintptr_t)to,
-             uintmaxToCommaString(size),
              (uintptr_t)from);
   s->translateState.from = from;
   s->translateState.to = to;