X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStorage.h;h=e541082ee6fd0eacfdc94296e6030e4a52c34c00;hb=54e6de853bd5260389006e75d661877ef1ea951d;hp=ae066c1c9ef5ccf5790ae023d690e6317cf3f2e0;hpb=4e79709df545c16812b85f2c27ab3411f5a7b54f;p=ghc-hetmet.git diff --git a/includes/Storage.h b/includes/Storage.h index ae066c1..e541082 100644 --- a/includes/Storage.h +++ b/includes/Storage.h @@ -55,7 +55,6 @@ 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) @@ -82,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 @@ -181,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); @@ -201,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 */ @@ -217,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 @@ -242,7 +240,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) @@ -255,63 +252,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 @@ -322,6 +296,8 @@ recordMutableLock(StgClosure *p) RELEASE_SM_LOCK; } +#endif // !IN_STG_CODE + /* ----------------------------------------------------------------------------- The CAF table - used to let us revert CAFs in GHCi -------------------------------------------------------------------------- */ @@ -356,15 +332,8 @@ void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p); make sense... -------------------------------------------------------------------------- */ -#define LOOKS_LIKE_INFO_PTR(p) \ - (p && (IS_FORWARDING_PTR(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) @@ -596,4 +565,20 @@ extern StgTSO * RTS_VAR(resurrected_threads); #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 */