projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Toggle whether the RTS gets build with debugger support for ghci
[ghc-hetmet.git]
/
rts
/
sm
/
GC.c
diff --git
a/rts/sm/GC.c
b/rts/sm/GC.c
index
0b08bc8
..
270784e
100644
(file)
--- a/
rts/sm/GC.c
+++ b/
rts/sm/GC.c
@@
-1,9
+1,14
@@
/* -----------------------------------------------------------------------------
*
/* -----------------------------------------------------------------------------
*
- * (c) The GHC Team 1998-2003
+ * (c) The GHC Team 1998-2006
*
* Generational garbage collector
*
*
* Generational garbage collector
*
+ * Documentation on the architecture of the Garbage Collector can be
+ * found in the online commentary:
+ *
+ * http://hackage.haskell.org/trac/ghc/wiki/Commentary/Rts/Storage/GC
+ *
* ---------------------------------------------------------------------------*/
#include "PosixSource.h"
* ---------------------------------------------------------------------------*/
#include "PosixSource.h"
@@
-12,8
+17,6
@@
#include "RtsUtils.h"
#include "Apply.h"
#include "OSThreads.h"
#include "RtsUtils.h"
#include "Apply.h"
#include "OSThreads.h"
-#include "Storage.h"
-#include "Stable.h"
#include "LdvProfile.h"
#include "Updates.h"
#include "Stats.h"
#include "LdvProfile.h"
#include "Updates.h"
#include "Stats.h"
@@
-479,10
+482,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.
@@
-650,7
+649,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;
}
}
}
}