projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2006-01-17 16:13:18 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
ProfHeap.c
diff --git
a/ghc/rts/ProfHeap.c
b/ghc/rts/ProfHeap.c
index
f98246c
..
362bafe
100644
(file)
--- a/
ghc/rts/ProfHeap.c
+++ b/
ghc/rts/ProfHeap.c
@@
-23,7
+23,6
@@
#include "ProfHeap.h"
#include "Stats.h"
#include "Hash.h"
#include "ProfHeap.h"
#include "Stats.h"
#include "Hash.h"
-#include "StrHash.h"
#include "RetainerProfile.h"
#include "LdvProfile.h"
#include "Arena.h"
#include "RetainerProfile.h"
#include "LdvProfile.h"
#include "Arena.h"
@@
-154,9
+153,11
@@
static char *type_names[] = {
, "ARR_WORDS"
, "ARR_WORDS"
- , "MUT_ARR_PTRS"
+ , "MUT_ARR_PTRS_CLEAN"
+ , "MUT_ARR_PTRS_DIRTY"
, "MUT_ARR_PTRS_FROZEN"
, "MUT_ARR_PTRS_FROZEN"
- , "MUT_VAR"
+ , "MUT_VAR_CLEAN"
+ , "MUT_VAR_DIRTY"
, "WEAK"
, "WEAK"
@@
-404,7
+405,7
@@
initHeapProfiling(void)
#ifdef PROFILING
if (doingLDVProfiling() && doingRetainerProfiling()) {
errorBelch("cannot mix -hb and -hr");
#ifdef PROFILING
if (doingLDVProfiling() && doingRetainerProfiling()) {
errorBelch("cannot mix -hb and -hr");
- stg_exit(1);
+ stg_exit(EXIT_FAILURE);
}
#endif
}
#endif
@@
-925,7
+926,8
@@
heapCensusChain( Census *census, bdescr *bd )
case MVAR:
case WEAK:
case STABLE_NAME:
case MVAR:
case WEAK:
case STABLE_NAME:
- case MUT_VAR:
+ case MUT_VAR_CLEAN:
+ case MUT_VAR_DIRTY:
prim = rtsTrue;
size = sizeW_fromITBL(info);
break;
prim = rtsTrue;
size = sizeW_fromITBL(info);
break;
@@
-947,7
+949,8
@@
heapCensusChain( Census *census, bdescr *bd )
size = arr_words_sizeW(stgCast(StgArrWords*,p));
break;
size = arr_words_sizeW(stgCast(StgArrWords*,p));
break;
- case MUT_ARR_PTRS:
+ case MUT_ARR_PTRS_CLEAN:
+ case MUT_ARR_PTRS_DIRTY:
case MUT_ARR_PTRS_FROZEN:
case MUT_ARR_PTRS_FROZEN0:
prim = rtsTrue;
case MUT_ARR_PTRS_FROZEN:
case MUT_ARR_PTRS_FROZEN0:
prim = rtsTrue;