[project @ 1999-09-15 13:45:14 by simonmar]

[ghc-hetmet.git] / ghc / rts / Storage.c

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index 88f8904..820a934 100644 (file)
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -1,5 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.10 1999/02/05 14:45:43 simonm Exp $
+ * $Id: Storage.c,v 1.18 1999/09/15 13:45:20 simonmar Exp $
+ *
+ * (c) The GHC Team, 1998-1999
  *
  * Storage manager front end
  *
@@ -51,9 +53,22 @@ initStorage (void)
   step *step;
   generation *gen;
 
+  /* If we're doing heap profiling, we want a two-space heap with a
+   * fixed-size allocation area so that we get roughly even-spaced
+   * samples.
+   */
+#if defined(PROFILING) || defined(DEBUG)
+  if (RtsFlags.ProfFlags.doHeapProfile) {
+    RtsFlags.GcFlags.generations = 1;
+    RtsFlags.GcFlags.steps = 1;
+    RtsFlags.GcFlags.oldGenFactor = 0;
+    RtsFlags.GcFlags.heapSizeSuggestion = 0;
+  }
+#endif
+
   if (RtsFlags.GcFlags.heapSizeSuggestion > 
       RtsFlags.GcFlags.maxHeapSize) {
-    barf("Suggested heap size (-H<size>) is larger than max. heap size (-M<size>)\n");
+    RtsFlags.GcFlags.maxHeapSize = RtsFlags.GcFlags.heapSizeSuggestion;
   }
 
   initBlockAllocator();
@@ -71,7 +86,7 @@ initStorage (void)
     gen->mut_once_list = END_MUT_LIST;
     gen->collections = 0;
     gen->failed_promotions = 0;
-    gen->max_blocks = RtsFlags.GcFlags.minOldGenSize;
+    gen->max_blocks = 0;
   }
 
   /* A couple of convenience pointers */
@@ -112,6 +127,8 @@ initStorage (void)
       step->hp = NULL;
       step->hpLim = NULL;
       step->hp_bd = NULL;
+      step->scan = NULL;
+      step->scan_bd = NULL;
       step->large_objects = NULL;
       step->new_large_objects = NULL;
       step->scavenged_large_objects = NULL;
@@ -145,6 +162,7 @@ initStorage (void)
   step->blocks   = allocNursery(NULL, nursery_blocks);
   step->n_blocks = nursery_blocks;
   current_nursery = step->blocks;
+  g0s0->to_space = NULL;
   /* hp, hpLim, hp_bd, to_space etc. aren't used in G0S0 */
 
   weak_ptr_list = NULL;
@@ -249,8 +267,10 @@ newCAF(StgClosure* caf)
     
     info = get_itbl(caf);
     ASSERT(info->type == IND_STATIC);
+#if 0
     STATIC_LINK2(info,caf) = caf_list;
     caf_list = caf;
+#endif
   }
 #endif
 }
@@ -383,21 +403,22 @@ calcLive(void)
   step *step;
 
   if (RtsFlags.GcFlags.generations == 1) {
-    live = g0s0->to_blocks * BLOCK_SIZE_W + 
+    live = (g0s0->to_blocks - 1) * BLOCK_SIZE_W + 
       ((lnat)g0s0->hp_bd->free - (lnat)g0s0->hp_bd->start) / sizeof(W_);
+    return live;
   }
 
   for (g = 0; g < RtsFlags.GcFlags.generations; g++) {
     for (s = 0; s < generations[g].n_steps; s++) {
       /* approximate amount of live data (doesn't take into account slop
-        * at end of each block).
-        */
+       * at end of each block).
+       */
       if (g == 0 && s == 0) { 
          continue; 
       }
       step = &generations[g].steps[s];
-      live += step->n_blocks * BLOCK_SIZE_W + 
-       ((lnat)step->hp_bd->free -(lnat)step->hp_bd->start) / sizeof(W_);
+      live += (step->n_blocks - 1) * BLOCK_SIZE_W +
+       ((lnat)step->hp_bd->free - (lnat)step->hp_bd->start) / sizeof(W_);
     }
   }
   return live;