X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FStorage.h;h=5d3e7733cf033d7cc2cd28e1fd77eb0a702bea30;hp=3fcdfebb9900cf20bb13a082ef2ce15f4383b051;hb=5d379cbe65e406d5c3a848fe7fcd090cafbfeb78;hpb=dbbf15c0f141357aa49b583286174867baadb821 diff --git a/includes/Storage.h b/includes/Storage.h index 3fcdfeb..5d3e773 100644 --- a/includes/Storage.h +++ b/includes/Storage.h @@ -55,19 +55,21 @@ typedef struct step_ { unsigned int no; // step number in this generation unsigned int abs_no; // absolute 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 + unsigned int n_words; // number of words 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 + StgTSO * threads; // threads in this step + // linked via global_link // ------------------------------------ // Fields below are used during GC only @@ -79,18 +81,17 @@ typedef struct step_ { #if defined(THREADED_RTS) char pad[128]; // make sure the following is // on a separate cache line. - SpinLock sync_todo; // lock for todos SpinLock sync_large_objects; // lock for large_objects // and scavenged_large_objects #endif + int mark; // mark (not copy)? (old gen only) + int compact; // compact (not sweep)? (old gen only) + bdescr * old_blocks; // bdescr of first from-space block unsigned int n_old_blocks; // number of blocks in from-space + unsigned int live_estimate; // for sweeping: estimate of live data - bdescr * todos; // blocks waiting to be scavenged - bdescr * todos_last; - unsigned int n_todos; // count of above - bdescr * part_blocks; // partially-full scanned blocks unsigned int n_part_blocks; // count of above @@ -99,6 +100,7 @@ typedef struct step_ { bdescr * bitmap; // bitmap for compacting collection + StgTSO * old_threads; } step; @@ -112,6 +114,7 @@ typedef struct generation_ { // stats information unsigned int collections; + unsigned int par_collections; unsigned int failed_promotions; // temporary use during GC: @@ -176,10 +179,10 @@ extern void freeStorage(void); -------------------------------------------------------------------------- */ -extern StgPtr allocate ( nat n ); -extern StgPtr allocateInGen ( generation *g, nat n ); -extern StgPtr allocateLocal ( Capability *cap, nat n ); -extern StgPtr allocatePinned ( nat n ); +extern StgPtr allocate ( lnat n ); +extern StgPtr allocateInGen ( generation *g, lnat n ); +extern StgPtr allocateLocal ( Capability *cap, lnat n ); +extern StgPtr allocatePinned ( lnat n ); extern lnat allocatedBytes ( void ); extern bdescr * RTS_VAR(small_alloc_list); @@ -196,7 +199,7 @@ doYouWantToGC( void ) } /* memory allocator for executable memory */ -extern void *allocateExec (nat bytes); +extern void* allocateExec(unsigned int len, void **exec_addr); extern void freeExec (void *p); /* for splitting blocks groups in two */ @@ -212,7 +215,7 @@ extern bdescr * splitLargeBlock (bdescr *bd, nat blocks); -------------------------------------------------------------------------- */ -extern void GarbageCollect(rtsBool force_major_gc); +extern void GarbageCollect(rtsBool force_major_gc, nat gc_type, Capability *cap); /* ----------------------------------------------------------------------------- Generational garbage collection support @@ -236,8 +239,6 @@ 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) @@ -250,63 +251,40 @@ extern SpinLock recordMutableGen_sync; #define ASSERT_SM_LOCK() #endif +#if !IN_STG_CODE + INLINE_HEADER void -recordMutableGen(StgClosure *p, generation *gen) +recordMutableGen(StgClosure *p, nat gen_no) { bdescr *bd; - bd = gen->mut_list; + bd = generations[gen_no].mut_list; if (bd->free >= bd->start + BLOCK_SIZE_W) { bdescr *new_bd; new_bd = allocBlock(); new_bd->link = bd; bd = new_bd; - gen->mut_list = bd; + generations[gen_no].mut_list = bd; } *bd->free++ = (StgWord)p; } INLINE_HEADER void -recordMutableGenLock(StgClosure *p, generation *gen) +recordMutableGenLock(StgClosure *p, nat gen_no) { ACQUIRE_SM_LOCK; - recordMutableGen(p,gen); + recordMutableGen(p,gen_no); 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) { bdescr *bd; ASSERT(closure_MUTABLE(p)); bd = Bdescr((P_)p); - if (bd->gen_no > 0) recordMutableGen(p, &RTS_DEREF(generations)[bd->gen_no]); + if (bd->gen_no > 0) recordMutableGen(p, bd->gen_no); } INLINE_HEADER void @@ -317,6 +295,8 @@ recordMutableLock(StgClosure *p) RELEASE_SM_LOCK; } +#endif // !IN_STG_CODE + /* ----------------------------------------------------------------------------- The CAF table - used to let us revert CAFs in GHCi -------------------------------------------------------------------------- */ @@ -351,15 +331,8 @@ void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p); make sense... -------------------------------------------------------------------------- */ -#define LOOKS_LIKE_INFO_PTR(p) \ - (p && LOOKS_LIKE_INFO_PTR_NOT_NULL(p)) - -#define LOOKS_LIKE_INFO_PTR_NOT_NULL(p) \ - (((StgInfoTable *)(INFO_PTR_TO_STRUCT(p)))->type != INVALID_OBJECT && \ - ((StgInfoTable *)(INFO_PTR_TO_STRUCT(p)))->type < N_CLOSURE_TYPES) - -#define LOOKS_LIKE_CLOSURE_PTR(p) \ - (LOOKS_LIKE_INFO_PTR((UNTAG_CLOSURE((StgClosure *)(p)))->header.info)) +INLINE_HEADER rtsBool LOOKS_LIKE_INFO_PTR (StgWord p); +INLINE_HEADER rtsBool LOOKS_LIKE_CLOSURE_PTR (void *p); // XXX StgClosure* /* ----------------------------------------------------------------------------- Macros for calculating how big a closure will be (used during allocation) @@ -534,16 +507,17 @@ extern void resizeNurseries ( nat blocks ); extern void resizeNurseriesFixed ( nat blocks ); extern lnat countNurseryBlocks ( void ); + /* ----------------------------------------------------------------------------- Functions from GC.c -------------------------------------------------------------------------- */ -typedef void (*evac_fn)(StgClosure **); +typedef void (*evac_fn)(void *user, StgClosure **root); extern void threadPaused ( Capability *cap, StgTSO * ); extern StgClosure * isAlive ( StgClosure *p ); -extern void markCAFs ( evac_fn evac ); -extern void GetRoots ( evac_fn evac ); +extern void markCAFs ( evac_fn evac, void *user ); +extern void GetRoots ( evac_fn evac, void *user ); /* ----------------------------------------------------------------------------- Stats 'n' DEBUG stuff @@ -586,4 +560,24 @@ extern StgClosure * RTS_VAR(caf_list); extern StgClosure * RTS_VAR(revertible_caf_list); extern StgTSO * RTS_VAR(resurrected_threads); +#define IS_FORWARDING_PTR(p) ((((StgWord)p) & 1) != 0) +#define MK_FORWARDING_PTR(p) (((StgWord)p) | 1) +#define UN_FORWARDING_PTR(p) (((StgWord)p) - 1) + +INLINE_HEADER rtsBool LOOKS_LIKE_INFO_PTR_NOT_NULL (StgWord p) +{ + StgInfoTable *info = INFO_PTR_TO_STRUCT(p); + return info->type != INVALID_OBJECT && info->type < N_CLOSURE_TYPES; +} + +INLINE_HEADER rtsBool LOOKS_LIKE_INFO_PTR (StgWord p) +{ + return p && (IS_FORWARDING_PTR(p) || LOOKS_LIKE_INFO_PTR_NOT_NULL(p)); +} + +INLINE_HEADER rtsBool LOOKS_LIKE_CLOSURE_PTR (void *p) +{ + return LOOKS_LIKE_INFO_PTR((StgWord)(UNTAG_CLOSURE((StgClosure *)(p)))->header.info); +} + #endif /* STORAGE_H */