projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow build settings to be overriden by adding mk/validate.mk
[ghc-hetmet.git]
/
rts
/
sm
/
GC.c
diff --git
a/rts/sm/GC.c
b/rts/sm/GC.c
index
2870be1
..
1fee394
100644
(file)
--- a/
rts/sm/GC.c
+++ b/
rts/sm/GC.c
@@
-208,8
+208,10
@@
GarbageCollect ( rtsBool force_major_gc )
debugTrace(DEBUG_gc, "starting GC");
#if defined(RTS_USER_SIGNALS)
debugTrace(DEBUG_gc, "starting GC");
#if defined(RTS_USER_SIGNALS)
- // block signals
- blockUserSignals();
+ if (RtsFlags.MiscFlags.install_signal_handlers) {
+ // block signals
+ blockUserSignals();
+ }
#endif
// tell the STM to discard any cached closures its hoping to re-use
#endif
// tell the STM to discard any cached closures its hoping to re-use
@@
-482,10
+484,6
@@
GarbageCollect ( rtsBool force_major_gc )
*/
markStablePtrTable(mark_root);
*/
markStablePtrTable(mark_root);
- /* Mark the root pointer table.
- */
- markRootPtrTable(mark_root);
-
/* -------------------------------------------------------------------------
* Repeatedly scavenge all the areas we know about until there's no
* more scavenging to be done.
/* -------------------------------------------------------------------------
* Repeatedly scavenge all the areas we know about until there's no
* more scavenging to be done.
@@
-653,7
+651,7
@@
GarbageCollect ( rtsBool force_major_gc )
if (g <= N) {
copied -= stp->hp_bd->start + BLOCK_SIZE_W -
stp->hp_bd->free;
if (g <= N) {
copied -= stp->hp_bd->start + BLOCK_SIZE_W -
stp->hp_bd->free;
- scavd_copied -= (P_)(BLOCK_ROUND_UP(stp->scavd_hp)) - stp->scavd_hp;
+ scavd_copied -= stp->scavd_hpLim - stp->scavd_hp;
}
}
}
}
@@
-1018,8
+1016,10
@@
GarbageCollect ( rtsBool force_major_gc )
stat_endGC(allocated, live, copied, scavd_copied, N);
#if defined(RTS_USER_SIGNALS)
stat_endGC(allocated, live, copied, scavd_copied, N);
#if defined(RTS_USER_SIGNALS)
- // unblock signals again
- unblockUserSignals();
+ if (RtsFlags.MiscFlags.install_signal_handlers) {
+ // unblock signals again
+ unblockUserSignals();
+ }
#endif
RELEASE_SM_LOCK;
#endif
RELEASE_SM_LOCK;