X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FProfHeap.c;h=f7fbd321be51b0f8f7dffe6ce7c069e948967ade;hb=1851bb3cb6b5e9f0d413da7afc9b58c768888ecf;hp=e90051c5e6a842f4ad60f261f7dffdea39bd4915;hpb=7408b39235bccdcde48df2a73337ff976fbc09b7;p=ghc-hetmet.git

diff --git a/rts/ProfHeap.c b/rts/ProfHeap.c
index e90051c..f7fbd32 100644
--- a/rts/ProfHeap.c
+++ b/rts/ProfHeap.c
@@ -309,7 +309,7 @@ void initProfiling1 (void)
 {
 }
 
-void freeProfiling1 (void)
+void freeProfiling (void)
 {
 }
 
@@ -876,10 +876,8 @@ heapCensusChain( Census *census, bdescr *bd )
 	    case CONSTR:
 	    case FUN:
 	    case IND_PERM:
-	    case IND_OLDGEN:
-	    case IND_OLDGEN_PERM:
-	    case CAF_BLACKHOLE:
 	    case BLACKHOLE:
+	    case BLOCKING_QUEUE:
 	    case FUN_1_0:
 	    case FUN_0_1:
 	    case FUN_1_1:
@@ -949,19 +947,35 @@ heapCensusChain( Census *census, bdescr *bd )
 		prim = rtsTrue;
 #ifdef PROFILING
 		if (RtsFlags.ProfFlags.includeTSOs) {
-		    size = tso_sizeW((StgTSO *)p);
+                    size = sizeofW(StgTSO);
 		    break;
 		} else {
 		    // Skip this TSO and move on to the next object
-		    p += tso_sizeW((StgTSO *)p);
+                    p += sizeofW(StgTSO);
 		    continue;
 		}
 #else
-		size = tso_sizeW((StgTSO *)p);
+                size = sizeofW(StgTSO);
 		break;
 #endif
 
-	    case TREC_CHUNK:
+            case STACK:
+		prim = rtsTrue;
+#ifdef PROFILING
+		if (RtsFlags.ProfFlags.includeTSOs) {
+                    size = stack_sizeW((StgStack*)p);
+                    break;
+		} else {
+		    // Skip this TSO and move on to the next object
+                    p += stack_sizeW((StgStack*)p);
+		    continue;
+		}
+#else
+                size = stack_sizeW((StgStack*)p);
+		break;
+#endif
+
+            case TREC_CHUNK:
 		prim = rtsTrue;
 		size = sizeofW(StgTRecChunk);
 		break;