Mps: added mps_message_type_gc_start()

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

7 files changed, 77 insertions, 23 deletions

diff --git a/mps/code/amcss.c b/mps/code/amcss.c
index db6432bcb87..76a5088360f 100644
--- a/mps/code/amcss.c
+++ b/mps/code/amcss.c
@@ -47,33 +47,54 @@ static mps_addr_t exactRoots[exactRootsCOUNT];
 static mps_addr_t ambigRoots[ambigRootsCOUNT];
 
 
-/* report - report statistics from any terminated GCs */
+/* report - report statistics from any messages */
 
 static void report(mps_arena_t arena)
 {
-  mps_message_t message;
   static int nCollections = 0;
+  mps_message_type_t type;
     
-  while (mps_message_get(&message, arena, mps_message_type_gc())) {
-    size_t live, condemned, not_condemned;
-
-    live = mps_message_gc_live_size(arena, message);
-    condemned = mps_message_gc_condemned_size(arena, message);
-    not_condemned = mps_message_gc_not_condemned_size(arena, message);
-
-    printf("\nCollection %d finished:\n", ++nCollections);
-    printf("live %lu\n", (unsigned long)live);
-    printf("condemned %lu\n", (unsigned long)condemned);
-    printf("not_condemned %lu\n", (unsigned long)not_condemned);
-
+  while(mps_message_queue_type(&type, arena)) {
+    mps_message_t message;
+
+    cdie(mps_message_get(&message, arena, type), "message get");
+
+    switch(type) {
+    /* @@@@ is using these macros in a switch supported? */
+    case mps_message_type_gc():
+      {
+        size_t live, condemned, not_condemned;
+
+        live = mps_message_gc_live_size(arena, message);
+        condemned = mps_message_gc_condemned_size(arena, message);
+        not_condemned = mps_message_gc_not_condemned_size(arena, message);
+
+        printf("\nCollection %d finished:\n", ++nCollections);
+        printf("live %lu\n", (unsigned long)live);
+        printf("condemned %lu\n", (unsigned long)condemned);
+        printf("not_condemned %lu\n", (unsigned long)not_condemned);
+
+        if(condemned > (gen1SIZE + gen2SIZE + (size_t)128) * 1024) {
+          /* When condemned size is larger than could happen in a gen 2
+           * collection (discounting ramps, natch), guess that was a dynamic
+           * collection, and reset the commit limit, so it doesn't run out. */
+          die(mps_arena_commit_limit_set(arena, 2 * testArenaSIZE),
+            "set limit");
+        }
+      }
+      break;
+    case mps_message_type_gc_start():
+      printf("\nCollection started.  Because:\n");
+      printf("%s\n", mps_message_gc_start_why(arena, message));
+
+      break;
+    default:
+      cdie(0, "unknown message type");
+    }
     mps_message_discard(arena, message);
-
-    if (condemned > (gen1SIZE + gen2SIZE + (size_t)128) * 1024)
-      /* When condemned size is larger than could happen in a gen 2
-       * collection (discounting ramps, natch), guess that was a dynamic
-       * collection, and reset the commit limit, so it doesn't run out. */
-      die(mps_arena_commit_limit_set(arena, 2 * testArenaSIZE), "set limit");
   }
+
+  return;
 }
 
 
@@ -276,6 +297,7 @@ int main(int argc, char **argv)
   die(mps_arena_create(&arena, mps_arena_class_vm(), 2*testArenaSIZE),
       "arena_create");
   mps_message_type_enable(arena, mps_message_type_gc());
+  mps_message_type_enable(arena, mps_message_type_gc_start());
   die(mps_arena_commit_limit_set(arena, testArenaSIZE), "set limit");
   die(mps_thread_reg(&thread, arena), "thread_reg");
   mps_tramp(&r, test, arena, 0);
diff --git a/mps/code/message.c b/mps/code/message.c
index a5f2651b928..2d12432acff 100644
--- a/mps/code/message.c
+++ b/mps/code/message.c
@@ -35,7 +35,7 @@ static void MessageDelete(Message message);
  * Message is on queue if and only if its ring is not a singleton.
  */
 
-static Bool MessageOnQueue(Message message)
+Bool MessageOnQueue(Message message)
 {
   AVERT(Message, message);
 
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 0badeaa737c..ebaf87b4d7c 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -290,6 +290,7 @@ extern Arena MessageArena(Message message);
 extern void MessageInit(Arena arena, Message message,
                         MessageClass class, MessageType type);
 extern void MessageFinish(Message message);
+extern Bool MessageOnQueue(Message message);
 extern void MessagePost(Arena arena, Message message);
 extern Bool MessagePoll(Arena arena);
 extern MessageType MessageGetType(Message message);
diff --git a/mps/code/mps.h b/mps/code/mps.h
index b20885c05ab..6493de0c598 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -532,6 +532,10 @@ extern size_t mps_message_gc_condemned_size(mps_arena_t, mps_message_t);
 extern size_t mps_message_gc_not_condemned_size(mps_arena_t,
                                                 mps_message_t);
 
+/* MPS_MESSAGE_TYPE_GC_START */
+
+extern const char *mps_message_gc_start_why(mps_arena_t, mps_message_t);
+
 
 /* Finalization */
 
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 06ad8a0ae1b..5f224f56c40 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -1719,6 +1719,24 @@ size_t mps_message_gc_not_condemned_size(mps_arena_t mps_arena,
   return (size_t)size;
 }
 
+/* MPS_MESSAGE_TYPE_GC_START */
+const char *mps_message_gc_start_why(mps_arena_t mps_arena,
+  mps_message_t mps_message)
+{
+  const char *s;
+  Arena arena = (Arena)mps_arena;
+  Message message = (Message)mps_message;
+
+  ArenaEnter(arena);
+
+  AVERT(Arena, arena);
+
+  s = MessageGCStartWhy(message);
+
+  ArenaLeave(arena);
+
+  return s;
+}
 
 /* Telemetry */
 
diff --git a/mps/code/testlib.h b/mps/code/testlib.h
index 37518548c7a..415aaaa8ded 100644
--- a/mps/code/testlib.h
+++ b/mps/code/testlib.h
@@ -99,7 +99,7 @@ extern void die(mps_res_t res, const char *s);
 
 /* die_expect -- get expected result or die
  *
- * If the first argument is not  thename as the second argument,
+ * If the first argument is not the same as the second argument,
  * prints the third argument on stderr and exits the program. 
  * Otherwise does nothing.
  *
diff --git a/mps/code/trace.c b/mps/code/trace.c
index 84dd7880bd0..757aee17db4 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -398,6 +398,7 @@ Bool TraceCheck(Trace trace)
   if (trace->chain != NULL)
     CHECKU(Chain, trace->chain);
   /* @@@@ checks for counts missing */
+  CHECKD(TraceStartMessage, &trace->startMessage);
   return TRUE;
 }
 
@@ -1524,9 +1525,10 @@ static Res rootGrey(Root root, void *p)
 void TraceStart(Trace trace, double mortality, double finishingTime)
 {
   Arena arena;
+  Message message;
+  Res res;
   Seg seg;
   Size size;
-  Res res;
 
   AVERT(Trace, trace);
   AVER(trace->state == TraceINIT);
@@ -1535,6 +1537,13 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
 
   arena = trace->arena;
 
+  message = TraceStartMessageMessage(&trace->startMessage);
+  /* Check message is not on queue.  If it _is_ then client
+     must have not read it yet. */
+  if(!MessageOnQueue(message)) {
+    MessagePost(arena, message);
+  }
+
   /* From the already set up white set, derive a grey set. */
 
   /* @@@@ Instead of iterating over all the segments, we could */