Fix a bug introduced with allocation counters
[ghc.git] / rts / LdvProfile.c
index 7bc032e..29fb24d 100644 (file)
@@ -37,10 +37,10 @@ processHeapClosureForDead( StgClosure *c )
 
     info = c->header.info;
     if (IS_FORWARDING_PTR(info)) {
-       // The size of the evacuated closure is currently stored in
-       // the LDV field.  See SET_EVACUAEE_FOR_LDV() in
-       // includes/StgLdvProf.h.
-       return LDVW(c);
+        // The size of the evacuated closure is currently stored in
+        // the LDV field.  See SET_EVACUAEE_FOR_LDV() in
+        // includes/StgLdvProf.h.
+        return LDVW(c);
     }
     info = INFO_PTR_TO_STRUCT(info);
 
@@ -56,17 +56,22 @@ processHeapClosureForDead( StgClosure *c )
     size = closure_sizeW(c);
 
     switch (info->type) {
-       /*
-         'inherently used' cases: do nothing.
-       */
+        /*
+          'inherently used' cases: do nothing.
+        */
     case TSO:
     case STACK:
     case MVAR_CLEAN:
     case MVAR_DIRTY:
+    case TVAR:
     case MUT_ARR_PTRS_CLEAN:
     case MUT_ARR_PTRS_DIRTY:
     case MUT_ARR_PTRS_FROZEN:
     case MUT_ARR_PTRS_FROZEN0:
+    case SMALL_MUT_ARR_PTRS_CLEAN:
+    case SMALL_MUT_ARR_PTRS_DIRTY:
+    case SMALL_MUT_ARR_PTRS_FROZEN:
+    case SMALL_MUT_ARR_PTRS_FROZEN0:
     case ARR_WORDS:
     case WEAK:
     case MUT_VAR_CLEAN:
@@ -75,11 +80,11 @@ processHeapClosureForDead( StgClosure *c )
     case PRIM:
     case MUT_PRIM:
     case TREC_CHUNK:
-       return size;
+        return size;
 
-       /*
-         ordinary cases: call LDV_recordDead().
-       */
+        /*
+          ordinary cases: call LDV_recordDead().
+        */
     case THUNK:
     case THUNK_1_0:
     case THUNK_0_1:
@@ -105,43 +110,42 @@ processHeapClosureForDead( StgClosure *c )
     case BLACKHOLE:
     case BLOCKING_QUEUE:
     case IND_PERM:
-       /*
-         'Ingore' cases
-       */
-       // Why can we ignore IND closures? We assume that
-       // any census is preceded by a major garbage collection, which
-       // IND closures cannot survive. Therefore, it is no
-       // use considering IND closures in the meanwhile
-       // because they will perish before the next census at any
-       // rate.
+        /*
+          'Ingore' cases
+        */
+        // Why can we ignore IND closures? We assume that
+        // any census is preceded by a major garbage collection, which
+        // IND closures cannot survive. Therefore, it is no
+        // use considering IND closures in the meanwhile
+        // because they will perish before the next census at any
+        // rate.
     case IND:
-       // Found a dead closure: record its size
-       LDV_recordDead(c, size);
-       return size;
-
-       /*
-         Error case
-       */
-       // static objects
+        // Found a dead closure: record its size
+        LDV_recordDead(c, size);
+        return size;
+
+        /*
+          Error case
+        */
+        // static objects
     case IND_STATIC:
     case CONSTR_STATIC:
     case FUN_STATIC:
     case THUNK_STATIC:
     case CONSTR_NOCAF_STATIC:
-       // stack objects
+        // stack objects
     case UPDATE_FRAME:
     case CATCH_FRAME:
     case UNDERFLOW_FRAME:
     case STOP_FRAME:
-    case RET_DYN:
     case RET_BCO:
     case RET_SMALL:
     case RET_BIG:
-       // others
+        // others
     case INVALID_OBJECT:
     default:
-       barf("Invalid object in processHeapClosureForDead(): %d", info->type);
-       return 0;
+        barf("Invalid object in processHeapClosureForDead(): %d", info->type);
+        return 0;
     }
 }
 
@@ -155,14 +159,14 @@ processHeapForDead( bdescr *bd )
     StgPtr p;
 
     while (bd != NULL) {
-       p = bd->start;
-       while (p < bd->free) {
-           p += processHeapClosureForDead((StgClosure *)p);
-           while (p < bd->free && !*p)   // skip slop
-               p++;
-       }
-       ASSERT(p == bd->free);
-       bd = bd->link;
+        p = bd->start;
+        while (p < bd->free) {
+            p += processHeapClosureForDead((StgClosure *)p);
+            while (p < bd->free && !*p)   // skip slop
+                p++;
+        }
+        ASSERT(p == bd->free);
+        bd = bd->link;
     }
 }
 
@@ -172,21 +176,16 @@ processHeapForDead( bdescr *bd )
 static void
 processNurseryForDead( void )
 {
-    StgPtr p, bdLimit;
+    StgPtr p;
     bdescr *bd;
 
-    bd = MainCapability.r.rNursery->blocks;
-    while (bd->start < bd->free) {
-       p = bd->start;
-       bdLimit = bd->start + BLOCK_SIZE_W;
-       while (p < bd->free && p < bdLimit) {
-           p += processHeapClosureForDead((StgClosure *)p);
-           while (p < bd->free && p < bdLimit && !*p)  // skip slop
-               p++;
-       }
-       bd = bd->link;
-       if (bd == NULL)
-           break;
+    for (bd = MainCapability.r.rNursery->blocks; bd != NULL; bd = bd->link) {
+        p = bd->start;
+        while (p < bd->free) {
+            while (p < bd->free && !*p) p++; // skip slop
+            if (p >= bd->free) break;
+            p += processHeapClosureForDead((StgClosure *)p);
+        }
     }
 }
 
@@ -202,7 +201,7 @@ processChainForDead( bdescr *bd )
         if (!(bd->flags & BF_PINNED)) {
             processHeapClosureForDead((StgClosure *)bd->start);
         }
-       bd = bd->link;
+        bd = bd->link;
     }
 }
 
@@ -212,7 +211,7 @@ processChainForDead( bdescr *bd )
  * current garbage collection.  This function is called from a garbage
  * collector right before tidying up, when all dead closures are still
  * stored in the heap and easy to identify.  Generations 0 through N
- * have just beed garbage collected.
+ * have just been garbage collected.
  * ----------------------------------------------------------------------- */
 void
 LdvCensusForDead( nat N )
@@ -221,16 +220,16 @@ LdvCensusForDead( nat N )
 
     // ldvTime == 0 means that LDV profiling is currently turned off.
     if (era == 0)
-       return;
+        return;
 
     if (RtsFlags.GcFlags.generations == 1) {
-       //
-       // Todo: support LDV for two-space garbage collection.
-       //
-       barf("Lag/Drag/Void profiling not supported with -G1");
+        //
+        // Todo: support LDV for two-space garbage collection.
+        //
+        barf("Lag/Drag/Void profiling not supported with -G1");
     } else {
         processNurseryForDead();
-       for (g = 0; g <= N; g++) {
+        for (g = 0; g <= N; g++) {
             processHeapForDead(generations[g].old_blocks);
             processChainForDead(generations[g].large_objects);
         }