X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FGCUtils.h;h=070a5545b05454b2ccbc88f63817fea9b302616f;hb=83d563cb9ede0ba792836e529b1e2929db926355;hp=249e0cf6160752c3affb1ac9c7af663a51d35b57;hpb=f86e7206ea94b48b94fb61007a1c5d55b8c60f45;p=ghc-hetmet.git diff --git a/rts/sm/GCUtils.h b/rts/sm/GCUtils.h index 249e0cf..070a554 100644 --- a/rts/sm/GCUtils.h +++ b/rts/sm/GCUtils.h @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * - * (c) The GHC Team 1998-2006 + * (c) The GHC Team 1998-2008 * * Generational garbage collector: utilities * @@ -11,15 +11,22 @@ * * --------------------------------------------------------------------------*/ -#include "SMP.h" +#ifndef SM_GCUTILS_H +#define SM_GCUTILS_H + +#include "BeginPrivate.h" bdescr *allocBlock_sync(void); void freeChain_sync(bdescr *bd); -void push_scanned_block (bdescr *bd, step_workspace *ws); -bdescr *grab_todo_block (step_workspace *ws); -StgPtr todo_block_full (nat size, step_workspace *ws); -StgPtr alloc_todo_block (step_workspace *ws, nat size); +void push_scanned_block (bdescr *bd, gen_workspace *ws); +StgPtr todo_block_full (nat size, gen_workspace *ws); +StgPtr alloc_todo_block (gen_workspace *ws, nat size); + +bdescr *grab_local_todo_block (gen_workspace *ws); +#if defined(THREADED_RTS) +bdescr *steal_todo_block (nat s); +#endif // Returns true if a block is partially full. This predicate is used to try // to re-use partial blocks wherever possible, and to reduce wastage. @@ -34,3 +41,26 @@ isPartiallyFull(bdescr *bd) #if DEBUG void printMutableList (generation *gen); #endif + +// Version of recordMutableGen for use during GC. This uses the +// mutable lists attached to the current gc_thread structure, which +// are the same as the mutable lists on the Capability. +INLINE_HEADER void +recordMutableGen_GC (StgClosure *p, nat gen_no) +{ + bdescr *bd; + + bd = gct->mut_lists[gen_no]; + if (bd->free >= bd->start + BLOCK_SIZE_W) { + bdescr *new_bd; + new_bd = allocBlock_sync(); + new_bd->link = bd; + bd = new_bd; + gct->mut_lists[gen_no] = bd; + } + *bd->free++ = (StgWord)p; +} + +#include "EndPrivate.h" + +#endif /* SM_GCUTILS_H */