projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For consistency, changed access of thread id to be through capability instead of...
[ghc-hetmet.git]
/
rts
/
Sanity.c
diff --git
a/rts/Sanity.c
b/rts/Sanity.c
index
8f3b627
..
3f4b3cf
100644
(file)
--- a/
rts/Sanity.c
+++ b/
rts/Sanity.c
@@
-312,10
+312,6
@@
checkClosure( StgClosure* p )
case IND_PERM:
case IND_OLDGEN:
case IND_OLDGEN_PERM:
case IND_PERM:
case IND_OLDGEN:
case IND_OLDGEN_PERM:
-#ifdef TICKY_TICKY
- case SE_BLACKHOLE:
- case SE_CAF_BLACKHOLE:
-#endif
case BLACKHOLE:
case CAF_BLACKHOLE:
case STABLE_NAME:
case BLACKHOLE:
case CAF_BLACKHOLE:
case STABLE_NAME:
@@
-637,10
+633,12
@@
checkHeapChunk(StgPtr start, StgPtr end)
#endif
void
#endif
void
-checkChain(bdescr *bd)
+checkLargeObjects(bdescr *bd)
{
while (bd != NULL) {
{
while (bd != NULL) {
- checkClosure((StgClosure *)bd->start);
+ if (!(bd->flags & BF_PINNED)) {
+ checkClosure((StgClosure *)bd->start);
+ }
bd = bd->link;
}
}
bd = bd->link;
}
}
@@
-798,7
+796,7
@@
checkGlobalTSOList (rtsBool checkTSOs)
// be on the mutable list.
if (tso->what_next == ThreadRelocated) continue;
if (tso->flags & (TSO_DIRTY|TSO_LINK_DIRTY)) {
// be on the mutable list.
if (tso->what_next == ThreadRelocated) continue;
if (tso->flags & (TSO_DIRTY|TSO_LINK_DIRTY)) {
- ASSERT(Bdescr((P_)tso)->gen_no == 0 || tso->flags & TSO_MARKED);
+ ASSERT(Bdescr((P_)tso)->gen_no == 0 || (tso->flags & TSO_MARKED));
tso->flags &= ~TSO_MARKED;
}
}
tso->flags &= ~TSO_MARKED;
}
}
@@
-828,7
+826,7
@@
checkMutableList( bdescr *mut_bd, nat gen )
}
void
}
void
-checkMutableLists (void)
+checkMutableLists (rtsBool checkTSOs)
{
nat g, i;
{
nat g, i;
@@
-838,7
+836,7
@@
checkMutableLists (void)
checkMutableList(capabilities[i].mut_lists[g], g);
}
}
checkMutableList(capabilities[i].mut_lists[g], g);
}
}
- checkGlobalTSOList(rtsTrue);
+ checkGlobalTSOList(checkTSOs);
}
/*
}
/*