projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add allocateInGen() for allocating in a specific generation, and cleanups
[ghc-hetmet.git]
/
rts
/
LdvProfile.c
diff --git
a/rts/LdvProfile.c
b/rts/LdvProfile.c
index
19ebe42
..
1838649
100644
(file)
--- a/
rts/LdvProfile.c
+++ b/
rts/LdvProfile.c
@@
-14,7
+14,6
@@
#include "RtsFlags.h"
#include "Profiling.h"
#include "Stats.h"
#include "RtsFlags.h"
#include "Profiling.h"
#include "Stats.h"
-#include "Storage.h"
#include "RtsUtils.h"
#include "Schedule.h"
#include "RtsUtils.h"
#include "Schedule.h"
@@
-97,7
+96,8
@@
processHeapClosureForDead( StgClosure *c )
'inherently used' cases: do nothing.
*/
case TSO:
'inherently used' cases: do nothing.
*/
case TSO:
- case MVAR:
+ case MVAR_CLEAN:
+ case MVAR_DIRTY:
case MUT_ARR_PTRS_CLEAN:
case MUT_ARR_PTRS_DIRTY:
case MUT_ARR_PTRS_FROZEN:
case MUT_ARR_PTRS_CLEAN:
case MUT_ARR_PTRS_DIRTY:
case MUT_ARR_PTRS_FROZEN:
@@
-108,10
+108,12
@@
processHeapClosureForDead( StgClosure *c )
case MUT_VAR_DIRTY:
case BCO:
case STABLE_NAME:
case MUT_VAR_DIRTY:
case BCO:
case STABLE_NAME:
- case TVAR_WAIT_QUEUE:
+ case TVAR_WATCH_QUEUE:
case TVAR:
case TREC_HEADER:
case TREC_CHUNK:
case TVAR:
case TREC_HEADER:
case TREC_CHUNK:
+ case INVARIANT_CHECK_QUEUE:
+ case ATOMIC_INVARIANT:
return size;
/*
return size;
/*
@@
-168,8
+170,6
@@
processHeapClosureForDead( StgClosure *c )
case CONSTR_STATIC:
case FUN_STATIC:
case THUNK_STATIC:
case CONSTR_STATIC:
case FUN_STATIC:
case THUNK_STATIC:
- case CONSTR_INTLIKE:
- case CONSTR_CHARLIKE:
case CONSTR_NOCAF_STATIC:
// stack objects
case UPDATE_FRAME:
case CONSTR_NOCAF_STATIC:
// stack objects
case UPDATE_FRAME:
@@
-178,9
+178,7
@@
processHeapClosureForDead( StgClosure *c )
case RET_DYN:
case RET_BCO:
case RET_SMALL:
case RET_DYN:
case RET_BCO:
case RET_SMALL:
- case RET_VEC_SMALL:
case RET_BIG:
case RET_BIG:
- case RET_VEC_BIG:
// others
case BLOCKED_FETCH:
case FETCH_ME:
// others
case BLOCKED_FETCH:
case FETCH_ME:
@@
-249,7
+247,7
@@
processSmallObjectPoolForDead( void )
bdescr *bd;
StgPtr p;
bdescr *bd;
StgPtr p;
- bd = small_alloc_list;
+ bd = g0s0->blocks;
// first block
if (bd == NULL)
// first block
if (bd == NULL)