X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FProfHeap.c;h=9aca5a9fc0820c183f1fc902a0c112ec4fc66b66;hb=66579ff945831c5fc9a17c58c722ff01f2268d76;hp=3f2b9f6c22396089a20f866ecf1d7c99e4f2ff59;hpb=629e852d8202408216e0cbb8362d1eb4beffbfcc;p=ghc-hetmet.git

diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c
index 3f2b9f6..9aca5a9 100644
--- a/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
@@ -146,7 +146,8 @@ static char *type_names[] = {
     "BLACKHOLE",
     "SE_BLACKHOLE",
     "SE_CAF_BLACKHOLE",
-    "MVAR",
+    "MVAR_CLEAN",
+    "MVAR_DIRTY",
     "ARR_WORDS",
     "MUT_ARR_PTRS_CLEAN",
     "MUT_ARR_PTRS_DIRTY",
@@ -181,7 +182,7 @@ static char *type_names[] = {
  * the band to which this closure's heap space is attributed in the
  * heap profile.
  * ------------------------------------------------------------------------- */
-STATIC_INLINE void *
+static void *
 closureIdentity( StgClosure *p )
 {
     switch (RtsFlags.ProfFlags.doHeapProfile) {
@@ -457,12 +458,8 @@ initHeapProfiling(void)
 	era = 0;
     }
 
-    {   // max_era = 2^LDV_SHIFT
-	nat p;
-	max_era = 1;
-	for (p = 0; p < LDV_SHIFT; p++)
-	    max_era *= 2;
-    }
+    // max_era = 2^LDV_SHIFT
+	max_era = 1 << LDV_SHIFT;
 
     n_censuses = 32;
     censuses = stgMallocBytes(sizeof(Census) * n_censuses, "initHeapProfiling");
@@ -978,7 +975,8 @@ heapCensusChain( Census *census, bdescr *bd )
 		size = bco_sizeW((StgBCO *)p);
 		break;
 
-	    case MVAR:
+            case MVAR_CLEAN:
+            case MVAR_DIRTY:
 	    case WEAK:
 	    case STABLE_NAME:
 	    case MUT_VAR_CLEAN:
@@ -1153,13 +1151,6 @@ heapCensus( void )
 #endif
 
   // Traverse the heap, collecting the census info
-
-  // First the small_alloc_list: we have to fix the free pointer at
-  // the end by calling tidyAllocatedLists() first.
-  tidyAllocateLists();
-  heapCensusChain( census, small_alloc_list );
-
-  // Now traverse the heap in each generation/step.
   if (RtsFlags.GcFlags.generations == 1) {
       heapCensusChain( census, g0s0->blocks );
   } else {