X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStorage.h;h=caa7c1d16d1f9119c80482cd6edc22956a81ec8a;hb=2378b2325df64a5ccc5b2e038ac3dbb848dea5f7;hp=62d57b1d7bd3bb68728c754b912e50292ae5a817;hpb=2cf1115cd06678e5255c39e9fd56787031c31c06;p=ghc-hetmet.git diff --git a/includes/Storage.h b/includes/Storage.h index 62d57b1..caa7c1d 100644 --- a/includes/Storage.h +++ b/includes/Storage.h @@ -53,42 +53,60 @@ * ------------------------------------------------------------------------- */ typedef struct step_ { - unsigned int no; // step number - int is_compacted; // compact this step? (old gen only) + unsigned int no; // step number in this generation + unsigned int abs_no; // absolute step number 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 // 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) + 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 + 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 + + StgTSO * old_threads; + } step; @@ -101,6 +119,7 @@ typedef struct generation_ { // stats information unsigned int collections; + unsigned int par_collections; unsigned int failed_promotions; // temporary use during GC: @@ -112,6 +131,8 @@ extern generation * RTS_VAR(generations); extern generation * RTS_VAR(g0); extern step * RTS_VAR(g0s0); extern generation * RTS_VAR(oldest_gen); +extern step * RTS_VAR(all_steps); +extern nat RTS_VAR(total_steps); /* ----------------------------------------------------------------------------- Initialisation / De-initialisation @@ -163,10 +184,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); @@ -186,6 +207,9 @@ doYouWantToGC( void ) extern void *allocateExec (nat bytes); extern void freeExec (void *p); +/* for splitting blocks groups in two */ +extern bdescr * splitLargeBlock (bdescr *bd, nat blocks); + /* ----------------------------------------------------------------------------- Performing Garbage Collection @@ -259,11 +283,28 @@ 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); - recordMutableGen(p,gen); + + 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); } @@ -319,7 +360,7 @@ void dirty_MUT_VAR(StgRegTable *reg, StgClosure *p); -------------------------------------------------------------------------- */ #define LOOKS_LIKE_INFO_PTR(p) \ - (p && LOOKS_LIKE_INFO_PTR_NOT_NULL(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 && \ @@ -501,16 +542,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 @@ -525,7 +567,7 @@ 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 ); @@ -547,11 +589,14 @@ extern void newDynCAF(StgClosure *); extern void move_TSO(StgTSO *src, StgTSO *dest); extern StgTSO *relocate_stack(StgTSO *dest, ptrdiff_t diff); -extern StgClosure * RTS_VAR(scavenged_static_objects); extern StgWeak * RTS_VAR(old_weak_ptr_list); extern StgWeak * RTS_VAR(weak_ptr_list); 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) + #endif /* STORAGE_H */