Mps: implementing mps_arena_expose

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

5 files changed, 80 insertions, 16 deletions

diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index e29a902ea32..925e697cb5d 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -477,6 +477,7 @@ extern Bool (ArenaStep)(Globals globals, double interval, double multiplier);
 extern void ArenaClamp(Globals globals);
 extern void ArenaRelease(Globals globals);
 extern void ArenaPark(Globals globals);
+extern void ArenaExpose(Globals globals);
 extern Res ArenaStartCollect(Globals globals);
 extern Res ArenaCollect(Globals globals);
 extern Bool ArenaHasAddr(Arena arena, Addr addr);
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 3a032e5d332..eb31abab1c1 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -238,6 +238,7 @@ typedef struct mps_fmt_fixed_s {
 extern void mps_arena_clamp(mps_arena_t);
 extern void mps_arena_release(mps_arena_t);
 extern void mps_arena_park(mps_arena_t);
+extern void mps_arena_expose(mps_arena_t);
 extern mps_res_t mps_arena_start_collect(mps_arena_t);
 extern mps_res_t mps_arena_collect(mps_arena_t);
 extern mps_bool_t mps_arena_step(mps_arena_t, double, double);
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index d855a68de41..6c90be25181 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -340,6 +340,14 @@ void mps_space_park(mps_space_t mps_space)
   mps_arena_park(mps_space);
 }
 
+void mps_arena_expose(mps_arena_t mps_arena)
+{
+  Arena arena = (Arena)mps_arena;
+  ArenaEnter(arena);
+  ArenaExpose(ArenaGlobals(arena));
+  ArenaLeave(arena);
+}
+
 
 mps_res_t mps_arena_start_collect(mps_space_t mps_space)
 {
diff --git a/mps/code/mpsicv.c b/mps/code/mpsicv.c
index b0129d04261..e81763cdc0a 100644
--- a/mps/code/mpsicv.c
+++ b/mps/code/mpsicv.c
@@ -26,7 +26,7 @@
 
 #define exactRootsCOUNT  49
 #define ambigRootsCOUNT  49
-#define OBJECTS          4000
+#define OBJECTS          200000
 #define patternFREQ      100
 
 /* objNULL needs to be odd so that it's ignored in exactRoots. */
@@ -275,6 +275,9 @@ static void *test(void *arg, size_t s)
   mps_chain_t chain;
   mps_root_t exactRoot, ambigRoot, singleRoot, fmtRoot;
   unsigned long i;
+  /* Leave arena clamped until we have allocated this many objects.
+     is 0 when arena has not been clamped. */
+  unsigned long clamp_until = 0;
   size_t j;
   mps_word_t collections;
   mps_pool_t mv;
@@ -301,10 +304,12 @@ static void *test(void *arg, size_t s)
 
   die(mps_ap_create(&ap, amcpool), "ap_create");
 
-  for(j = 0; j < exactRootsCOUNT; ++j)
+  for(j = 0; j < exactRootsCOUNT; ++j) {
     exactRoots[j] = objNULL;
-  for(j = 0; j < ambigRootsCOUNT; ++j)
+  }
+  for(j = 0; j < ambigRootsCOUNT; ++j) {
     ambigRoots[j] = (mps_addr_t)rnd();
+  }
 
   die(mps_root_create_table_masked(&exactRoot, arena,
                                    MPS_RANK_EXACT, (mps_rm_t)0,
@@ -353,40 +358,63 @@ static void *test(void *arg, size_t s)
 
     c = mps_collections(arena);
 
-    if (collections != c) {
+    if(collections != c) {
       collections = c;
       printf("\nCollection %u, %lu objects.\n", c, i);
-      for(r = 0; r < exactRootsCOUNT; ++r)
+      for(r = 0; r < exactRootsCOUNT; ++r) {
         cdie(exactRoots[r] == objNULL || dylan_check(exactRoots[r]),
              "all roots check");
+      }
+      if(collections == 1) {
+        mps_arena_clamp(arena);
+        clamp_until = i + 10000;
+      }
+      if(collections % 3 == 0) {
+        mps_arena_expose(arena);
+        mps_arena_release(arena);
+      }
+      if(collections % 3 == 2) {
+        mps_arena_park(arena);
+        mps_arena_release(arena);
+      }
     }
 
-    if (rnd() % patternFREQ == 0)
+    if(clamp_until && i >= clamp_until) {
+      mps_arena_release(arena);
+      clamp_until = 0;
+    }
+
+    if (rnd() % patternFREQ == 0) {
       switch(rnd() % 4) {
-      case 0: case 1: {
+      case 0: case 1:
         die(mps_ap_alloc_pattern_begin(ap, ramp), "alloc_pattern_begin");
         ++rampCount;
-        } break;
-      case 2: {
+        break;
+      case 2:
         res = mps_ap_alloc_pattern_end(ap, ramp);
         cdie(rampCount > 0 ? res == MPS_RES_OK : res == MPS_RES_FAIL,
              "alloc_pattern_end");
-        if (rampCount > 0) --rampCount;
-        } break;
-      case 3: {
+        if (rampCount > 0) {
+          --rampCount;
+        }
+        break;
+      case 3:
         die(mps_ap_alloc_pattern_reset(ap), "alloc_pattern_reset");
         rampCount = 0;
-        } break;
+        break;
       }
+    }
 
-    if (rnd() & 1)
+    if (rnd() & 1) {
       exactRoots[rnd() % exactRootsCOUNT] = make();
-    else
+    } else {
       ambigRoots[rnd() % ambigRootsCOUNT] = make();
+    }
 
     r = rnd() % exactRootsCOUNT;
-    if (exactRoots[r] != objNULL)
+    if (exactRoots[r] != objNULL)  {
       cdie(dylan_check(exactRoots[r]), "random root check");
+    }
   }
 
   arena_commit_test(arena);
diff --git a/mps/code/trace.c b/mps/code/trace.c
index 5c6ed5e3c43..1f6fb5ea86f 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -1672,6 +1672,32 @@ void ArenaPark(Globals globals)
   }
 }
 
+/* ArenaExpose -- park arena and then lift all protection barriers. */
+
+void ArenaExpose(Globals globals)
+{
+  Seg seg;
+  Arena arena;
+
+  AVERT(Globals, globals);
+
+  ArenaPark(globals);
+
+  arena = GlobalsArena(globals);
+  if(SegFirst(&seg, arena)) {
+    Addr base;
+
+    do {
+      base = SegBase(seg);
+      if((SegPool(seg)->class->attr & AttrSCAN) != 0) {
+        SegSetSummary(seg, RefSetUNIV);
+        AVER(SegSM(seg) == AccessSetEMPTY);
+      }
+    } while(SegNext(&seg, arena, base));
+  }
+  return;
+}
+
 /* ArenaStartCollect -- start a collection of everything in the
  * arena; leave unclamped. */