diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2006-10-24 09:13:57 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2006-10-24 09:13:57 +0000 |
| commit | ab0e778ccfde61aed4c22679b24d175fc6cc9bf3 (patch) | |
| tree | a0f6148a77644c5a7baa68b521bf3b1116dce50b /includes/Storage.h | |
| parent | 2246c514eade324d70058ba3135dc0c51ee9353b (diff) | |
| download | haskell-ab0e778ccfde61aed4c22679b24d175fc6cc9bf3.tar.gz | |
Split GC.c, and move storage manager into sm/ directory
In preparation for parallel GC, split up the monolithic GC.c file into
smaller parts. Also in this patch (and difficult to separate,
unfortunatley):
- Don't include Stable.h in Rts.h, instead just include it where
necessary.
- consistently use STATIC_INLINE in source files, and INLINE_HEADER
in header files. STATIC_INLINE is now turned off when DEBUG is on,
to make debugging easier.
- The GC no longer takes the get_roots function as an argument.
We weren't making use of this generalisation.
Diffstat (limited to 'includes/Storage.h')
| -rw-r--r-- | includes/Storage.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/Storage.h b/includes/Storage.h index 09b1b04881..12be6d19d0 100644 --- a/includes/Storage.h +++ b/includes/Storage.h @@ -185,7 +185,7 @@ extern void freeExec (void *p); MarkRoot(StgClosure *p) Returns the new location of the root. -------------------------------------------------------------------------- */ -extern void GarbageCollect(void (*get_roots)(evac_fn),rtsBool force_major_gc); +extern void GarbageCollect(rtsBool force_major_gc); /* ----------------------------------------------------------------------------- Generational garbage collection support @@ -362,7 +362,7 @@ INLINE_HEADER StgWord tso_sizeW ( StgTSO *tso ) INLINE_HEADER StgWord bco_sizeW ( StgBCO *bco ) { return bco->size; } -STATIC_INLINE nat +INLINE_HEADER nat closure_sizeW_ (StgClosure *p, StgInfoTable *info) { switch (info->type) { @@ -428,7 +428,7 @@ closure_sizeW_ (StgClosure *p, StgInfoTable *info) } // The definitive way to find the size, in words, of a heap-allocated closure -STATIC_INLINE nat +INLINE_HEADER nat closure_sizeW (StgClosure *p) { return closure_sizeW_(p, get_itbl(p)); @@ -483,6 +483,8 @@ extern lnat countNurseryBlocks ( void ); Functions from GC.c -------------------------------------------------------------------------- */ +typedef void (*evac_fn)(StgClosure **); + extern void threadPaused ( Capability *cap, StgTSO * ); extern StgClosure * isAlive ( StgClosure *p ); extern void markCAFs ( evac_fn evac ); |