From: simonmar <unknown>
Date: Thu, 29 Nov 2001 16:38:13 +0000 (+0000)
Subject: [project @ 2001-11-29 16:38:13 by simonmar]
X-Git-Tag: Approximately_9120_patches~487
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b560e2a5b55081cd1ffcd2d3a1cc8cde06c89f81;p=ghc-hetmet.git

[project @ 2001-11-29 16:38:13 by simonmar]
Fix for heap profiling when selecting by lag/drag/void/use: I forgot
to make the final LdvCensusKillAll() call just before outputing the
census info.

Having tested this stuff on the compiler itself, I now declare it to
be working (famous last words!).
---

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index b57cd68..b8dfcf9 100644
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.31 2001/11/28 17:45:13 simonmar Exp $
+ * $Id: ProfHeap.c,v 1.32 2001/11/29 16:38:13 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -442,17 +442,9 @@ endHeapProfiling(void)
 #endif
 
 #ifdef PROFILING
-  // Note: 
-  //   We do not need to perform a major garbage collection because all the
-  //   closures created since the last census will not affect the profiling
-  //   statistics anyhow.
-  if (RtsFlags.ProfFlags.doHeapProfile == HEAP_BY_LDV) 
-    LdvCensusKillAll();
-#endif
-
-#ifdef PROFILING
     if (doingLDVProfiling()) {
 	nat t;
+	LdvCensusKillAll();
 	aggregateCensusInfo();
 	for (t = 1; t < era; t++) {
 	    dumpCensus( &censuses[t] );