X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FGCUtils.h;h=1fbbe3c377b1b9eef8eb0d604a5d78c791283627;hb=023b31fe82746b937ab0eba78b11559be782ebcf;hp=70dd7a882fce5f74db7ecb2eb6a1b5586dedc642;hpb=64c17c4561cf419a4c70511bafc0815ea670bb2e;p=ghc-hetmet.git

diff --git a/rts/sm/GCUtils.h b/rts/sm/GCUtils.h
index 70dd7a8..1fbbe3c 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,5 +11,56 @@
  *
  * --------------------------------------------------------------------------*/
 
-bdescr *gc_alloc_block(step *stp);
-bdescr *gc_alloc_scavd_block(step *stp);
+#ifndef SM_GCUTILS_H
+#define SM_GCUTILS_H
+
+BEGIN_RTS_PRIVATE
+
+bdescr *allocBlock_sync(void);
+void    freeChain_sync(bdescr *bd);
+
+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.
+// We might need to tweak the actual value.
+INLINE_HEADER rtsBool
+isPartiallyFull(bdescr *bd)
+{
+    return (bd->free + WORK_UNIT_WORDS < bd->start + BLOCK_SIZE_W);
+}
+
+
+#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;
+}
+
+END_RTS_PRIVATE
+
+#endif /* SM_GCUTILS_H */