summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2008-09-09 13:34:53 +0000
committerSimon Marlow <marlowsd@gmail.com>2008-09-09 13:34:53 +0000
commit886d3dbfc27a159da9c38cc237517a3036ac3a8f (patch)
tree2dbb4e23ffd3e2e5dc510415229f7ff01bcf1ee0 /rts
parent128a7fae5da321c24008b1d53ece0a8b58912c82 (diff)
downloadhaskell-886d3dbfc27a159da9c38cc237517a3036ac3a8f.tar.gz
Move checkGlobalTSOList() call from GarbageCollect() to checkSanity()
Diffstat (limited to 'rts')
-rw-r--r--rts/sm/GC.c2
-rw-r--r--rts/sm/Storage.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index c254fcb54f..f8a0980e51 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -494,8 +494,6 @@ GarbageCollect ( rtsBool force_major_gc )
sweep(&oldest_gen->steps[0]);
}
- IF_DEBUG(sanity, checkGlobalTSOList(rtsFalse));
-
/* run through all the generations/steps and tidy up
*/
copied = 0;
diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index 9e820ff0f6..6cccf34121 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -1395,6 +1395,14 @@ checkSanity( void )
checkFreeListSanity();
}
+
+#if defined(THREADED_RTS)
+ // check the stacks too in threaded mode, because we don't do a
+ // full heap sanity check in this case (see checkHeap())
+ checkGlobalTSOList(rtsTrue);
+#else
+ checkGlobalTSOList(rtsFalse);
+#endif
}
/* Nursery sanity check */