X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FStorage.c;h=6b16cc409eccbe395212f463b452313cab7c3a5f;hb=4c394999264d602f10e7623cefa7588423c4f68b;hp=a07685b25e89c26762f8d9e5435d22718b6092c5;hpb=06f9b7c365fb9e9b53723f892b4d63b4f7a56e9a;p=ghc-hetmet.git

diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index a07685b..6b16cc4 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -31,6 +31,7 @@
 #include "Trace.h"
 #include "GC.h"
 #include "GCUtils.h"
+#include "Evac.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -51,6 +52,9 @@ generation *g0		= NULL; /* generation 0, for convenience */
 generation *oldest_gen  = NULL; /* oldest generation, for convenience */
 step *g0s0 		= NULL; /* generation 0, step 0, for convenience */
 
+nat total_steps         = 0;
+step *all_steps         = NULL; /* single array of steps */
+
 ullong total_allocated = 0;	/* total memory allocated during run */
 
 nat n_nurseries         = 0;    /* == RtsFlags.ParFlags.nNodes, convenience */
@@ -80,6 +84,7 @@ static void
 initStep (step *stp, int g, int s)
 {
     stp->no = s;
+    stp->abs_no = RtsFlags.GcFlags.steps * g + s;
     stp->blocks = NULL;
     stp->n_blocks = 0;
     stp->old_blocks = NULL;
@@ -103,7 +108,6 @@ initStorage( void )
 {
   nat g, s;
   generation *gen;
-  step *step_arr;
 
   if (generations != NULL) {
       // multi-init protection
@@ -151,10 +155,9 @@ initStorage( void )
      it this way, because we need the invariant that two step pointers
      can be directly compared to see which is the oldest.
      Remember that the last generation has only one step. */
-  step_arr = stgMallocBytes(sizeof(struct step_) 
-			    * (1 + ((RtsFlags.GcFlags.generations - 1)
-				    * RtsFlags.GcFlags.steps)),
-			    "initStorage: steps");
+  total_steps = 1 + (RtsFlags.GcFlags.generations - 1) * RtsFlags.GcFlags.steps;
+  all_steps   = stgMallocBytes(total_steps * sizeof(struct step_),
+                               "initStorage: steps");
 
   /* Initialise all generations */
   for(g = 0; g < RtsFlags.GcFlags.generations; g++) {
@@ -176,19 +179,19 @@ initStorage( void )
 
     /* Oldest generation: one step */
     oldest_gen->n_steps = 1;
-    oldest_gen->steps   = step_arr + (RtsFlags.GcFlags.generations - 1)
+    oldest_gen->steps   = all_steps + (RtsFlags.GcFlags.generations - 1)
 	                              * RtsFlags.GcFlags.steps;
 
     /* set up all except the oldest generation with 2 steps */
     for(g = 0; g < RtsFlags.GcFlags.generations-1; g++) {
       generations[g].n_steps = RtsFlags.GcFlags.steps;
-      generations[g].steps   = step_arr + g * RtsFlags.GcFlags.steps;
+      generations[g].steps   = all_steps + g * RtsFlags.GcFlags.steps;
     }
     
   } else {
     /* single generation, i.e. a two-space collector */
     g0->n_steps = 1;
-    g0->steps   = step_arr;
+    g0->steps   = all_steps;
   }
 
 #ifdef THREADED_RTS
@@ -256,6 +259,8 @@ initStorage( void )
 
 #ifdef THREADED_RTS
   initSpinLock(&gc_alloc_block_sync);
+  initSpinLock(&recordMutableGen_sync);
+  whitehole_spin = 0;
 #endif
 
   IF_DEBUG(gc, statDescribeGens());
@@ -633,6 +638,34 @@ allocatedBytes( void )
     return allocated;
 }
 
+// split N blocks off the start of the given bdescr, returning the 
+// remainder as a new block group.  We treat the remainder as if it
+// had been freshly allocated in generation 0.
+bdescr *
+splitLargeBlock (bdescr *bd, nat blocks)
+{
+    bdescr *new_bd;
+
+    // subtract the original number of blocks from the counter first
+    bd->step->n_large_blocks -= bd->blocks;
+
+    new_bd = splitBlockGroup (bd, blocks);
+
+    dbl_link_onto(new_bd, &g0s0->large_objects);
+    g0s0->n_large_blocks += new_bd->blocks;
+    new_bd->gen_no  = g0s0->no;
+    new_bd->step    = g0s0;
+    new_bd->flags   = BF_LARGE;
+    new_bd->free    = bd->free;
+
+    // add the new number of blocks to the counter.  Due to the gaps
+    // for block descriptor, new_bd->blocks + bd->blocks might not be
+    // equal to the original bd->blocks, which is why we do it this way.
+    bd->step->n_large_blocks += bd->blocks;
+
+    return new_bd;
+}    
+
 /* -----------------------------------------------------------------------------
    allocateLocal()