X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FLdvProfile.c;h=c2e7d7ec5a412313f53352bfd820973409ffea90;hb=68b77366cbb16ff237320cca7260909050c41a50;hp=b5c0e63f01faeb6fd039422bf85118ac4f0ec0cd;hpb=948c01bdb7f42504487a624b229137694871efd0;p=ghc-hetmet.git

diff --git a/rts/LdvProfile.c b/rts/LdvProfile.c
index b5c0e63..c2e7d7e 100644
--- a/rts/LdvProfile.c
+++ b/rts/LdvProfile.c
@@ -233,27 +233,6 @@ processNurseryForDead( void )
 }
 
 /* --------------------------------------------------------------------------
- * Calls processHeapClosureForDead() on every *dead* closures in the
- * small object pool.
- * ----------------------------------------------------------------------- */
-static void
-processSmallObjectPoolForDead( void )
-{
-    bdescr *bd;
-    StgPtr p;
-
-    for (bd = g0s0->blocks; bd != NULL; 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);
-    }
-}
-
-/* --------------------------------------------------------------------------
  * Calls processHeapClosureForDead() on every *dead* closures in the closure
  * chain.
  * ----------------------------------------------------------------------- */
@@ -280,7 +259,7 @@ processChainForDead( bdescr *bd )
 void
 LdvCensusForDead( nat N )
 {
-    nat g, s;
+    nat g;
 
     // ldvTime == 0 means that LDV profiling is currently turned off.
     if (era == 0)
@@ -292,17 +271,11 @@ LdvCensusForDead( nat N )
 	//
 	barf("Lag/Drag/Void profiling not supported with -G1");
     } else {
-	for (g = 0; g <= N; g++)
-	    for (s = 0; s < generations[g].n_steps; s++) {
-		if (g == 0 && s == 0) {
-		    processSmallObjectPoolForDead();
-		    processNurseryForDead();
-		    processChainForDead(generations[g].steps[s].large_objects);
-		} else{
-		    processHeapForDead(generations[g].steps[s].old_blocks);
-		    processChainForDead(generations[g].steps[s].large_objects);
-		}
-	    }
+        processNurseryForDead();
+	for (g = 0; g <= N; g++) {
+            processHeapForDead(generations[g].old_blocks);
+            processChainForDead(generations[g].large_objects);
+        }
     }
 }