X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStorage.h;h=d545054cbef46b5f35a9c0a410ace6b7e08ee362;hb=06f9b7c365fb9e9b53723f892b4d63b4f7a56e9a;hp=238b858406dca541636c9c3b3a14b31c988d0b12;hpb=68ed90d8b2f31f9bcae7b869413819eb8fa0aa40;p=ghc-hetmet.git diff --git a/includes/Storage.h b/includes/Storage.h index 238b858..d545054 100644 --- a/includes/Storage.h +++ b/includes/Storage.h @@ -11,6 +11,7 @@ #include #include "OSThreads.h" +#include "SMP.h" /* ----------------------------------------------------------------------------- * Generational GC @@ -52,49 +53,58 @@ * ------------------------------------------------------------------------- */ typedef struct step_ { - unsigned int no; /* step number */ - bdescr * blocks; /* blocks in this step */ - unsigned int n_blocks; /* number of blocks */ - struct step_ * to; /* destination step for live objects */ - struct generation_ * gen; /* generation this step belongs to */ - unsigned int gen_no; /* generation number (cached) */ - bdescr * large_objects; /* large objects (doubly linked) */ - unsigned int n_large_blocks; /* no. of blocks used by large objs */ - int is_compacted; /* compact this step? (old gen only) */ - - /* During GC, if we are collecting this step, blocks and n_blocks - * are copied into the following two fields. After GC, these blocks - * are freed. */ - bdescr * old_blocks; /* bdescr of first from-space block */ - unsigned int n_old_blocks; /* number of blocks in from-space */ - - /* temporary use during GC: */ - StgPtr hp; /* next free locn in to-space */ - StgPtr hpLim; /* end of current to-space block */ - bdescr * hp_bd; /* bdescr of current to-space block */ - StgPtr scavd_hp; /* ... same as above, but already */ - StgPtr scavd_hpLim; /* scavenged. */ - bdescr * scan_bd; /* block currently being scanned */ - StgPtr scan; /* scan pointer in current block */ - bdescr * new_large_objects; /* large objects collected so far */ - bdescr * scavenged_large_objects; /* live large objs after GC (d-link) */ - unsigned int n_scavenged_large_blocks;/* size of above */ - bdescr * bitmap; /* bitmap for compacting collection */ + unsigned int no; // step number + int is_compacted; // compact this step? (old gen only) + + struct generation_ * gen; // generation this step belongs to + unsigned int gen_no; // generation number (cached) + + bdescr * blocks; // blocks in this step + unsigned int n_blocks; // number of blocks + + struct step_ * to; // destination step for live objects + + bdescr * large_objects; // large objects (doubly linked) + unsigned int n_large_blocks; // no. of blocks used by large objs + + // ------------------------------------ + // Fields below are used during GC only + + // During GC, if we are collecting this step, blocks and n_blocks + // are copied into the following two fields. After GC, these blocks + // are freed. + bdescr * old_blocks; // bdescr of first from-space block + unsigned int n_old_blocks; // number of blocks in from-space + + bdescr * todos; // blocks waiting to be scavenged + unsigned int n_todos; // count of above + +#if defined(THREADED_RTS) + SpinLock sync_todo; // lock for todos + SpinLock sync_large_objects; // lock for large_objects + // and scavenged_large_objects +#endif + + bdescr * scavenged_large_objects; // live large objs after GC (d-link) + unsigned int n_scavenged_large_blocks; // size (not count) of above + + bdescr * bitmap; // bitmap for compacting collection } step; + typedef struct generation_ { - unsigned int no; /* generation number */ - step * steps; /* steps */ - unsigned int n_steps; /* number of steps */ - unsigned int max_blocks; /* max blocks in step 0 */ - bdescr *mut_list; /* mut objects in this gen (not G0)*/ - - /* temporary use during GC: */ - bdescr *saved_mut_list; - - /* stats information */ - unsigned int collections; - unsigned int failed_promotions; + unsigned int no; // generation number + step * steps; // steps + unsigned int n_steps; // number of steps + unsigned int max_blocks; // max blocks in step 0 + bdescr *mut_list; // mut objects in this gen (not G0) + + // stats information + unsigned int collections; + unsigned int failed_promotions; + + // temporary use during GC: + bdescr *saved_mut_list; } generation; extern generation * RTS_VAR(generations); @@ -163,9 +173,6 @@ extern bdescr * RTS_VAR(small_alloc_list); extern bdescr * RTS_VAR(large_alloc_list); extern bdescr * RTS_VAR(pinned_object_block); -extern StgPtr RTS_VAR(alloc_Hp); -extern StgPtr RTS_VAR(alloc_HpLim); - extern nat RTS_VAR(alloc_blocks); extern nat RTS_VAR(alloc_blocks_lim); @@ -186,8 +193,7 @@ extern void freeExec (void *p); 'get_roots' is called to find all the roots that the system knows about. - StgClosure Called by get_roots on each root. - MarkRoot(StgClosure *p) Returns the new location of the root. + -------------------------------------------------------------------------- */ extern void GarbageCollect(rtsBool force_major_gc); @@ -215,6 +221,7 @@ extern void GarbageCollect(rtsBool force_major_gc); #if defined(THREADED_RTS) extern Mutex sm_mutex; extern Mutex atomic_modify_mutvar_mutex; +extern SpinLock recordMutableGen_sync; #endif #if defined(THREADED_RTS) @@ -252,6 +259,31 @@ recordMutableGenLock(StgClosure *p, generation *gen) RELEASE_SM_LOCK; } +extern bdescr *allocBlock_sync(void); + +// Version of recordMutableGen() for use in parallel GC. The same as +// recordMutableGen(), except that we surround it with a spinlock and +// call the spinlock version of allocBlock(). +INLINE_HEADER void +recordMutableGen_GC(StgClosure *p, generation *gen) +{ + bdescr *bd; + + ACQUIRE_SPIN_LOCK(&recordMutableGen_sync); + + bd = gen->mut_list; + if (bd->free >= bd->start + BLOCK_SIZE_W) { + bdescr *new_bd; + new_bd = allocBlock_sync(); + new_bd->link = bd; + bd = new_bd; + gen->mut_list = bd; + } + *bd->free++ = (StgWord)p; + + RELEASE_SPIN_LOCK(&recordMutableGen_sync); +} + INLINE_HEADER void recordMutable(StgClosure *p) { @@ -495,6 +527,7 @@ typedef void (*evac_fn)(StgClosure **); extern void threadPaused ( Capability *cap, StgTSO * ); extern StgClosure * isAlive ( StgClosure *p ); extern void markCAFs ( evac_fn evac ); +extern void GetRoots ( evac_fn evac ); /* ----------------------------------------------------------------------------- Stats 'n' DEBUG stuff @@ -503,11 +536,13 @@ extern void markCAFs ( evac_fn evac ); extern ullong RTS_VAR(total_allocated); extern lnat calcAllocated ( void ); -extern lnat calcLive ( void ); +extern lnat calcLiveBlocks ( void ); +extern lnat calcLiveWords ( void ); +extern lnat countOccupied ( bdescr *bd ); extern lnat calcNeeded ( void ); #if defined(DEBUG) -extern void memInventory(void); +extern void memInventory(rtsBool show); extern void checkSanity(void); extern nat countBlocks(bdescr *); extern void checkNurserySanity( step *stp );