Mark/compact: use a dynamically-sized mark stack, and don't do linear scan

[ghc-hetmet.git] / rts / sm / GC.h

diff --git a/rts/sm/GC.h b/rts/sm/GC.h
index 675d323..cddba00 100644 (file)
--- a/rts/sm/GC.h
+++ b/rts/sm/GC.h
@@ -14,6 +14,8 @@
 #ifndef SM_GC_H
 #define SM_GC_H
 
+BEGIN_RTS_PRIVATE
+
 void GarbageCollect(rtsBool force_major_gc, nat gc_type, Capability *cap);
 
 typedef void (*evac_fn)(void *user, StgClosure **root);
@@ -24,14 +26,10 @@ void         markCAFs     ( evac_fn evac, void *user );
 extern nat N;
 extern rtsBool major_gc;
 
-extern bdescr *mark_stack_bdescr;
-extern StgPtr *mark_stack;
-extern StgPtr *mark_sp;
-extern StgPtr *mark_splim;
-
-extern rtsBool mark_stack_overflowed;
-extern bdescr *oldgen_scan_bd;
-extern StgPtr  oldgen_scan;
+extern bdescr *mark_stack_bd;
+extern bdescr *mark_stack_top_bd;
+extern StgPtr mark_sp;
+extern StgPtr mark_splim;
 
 extern long copied;
 
@@ -42,7 +40,7 @@ extern nat mutlist_MUTVARS, mutlist_MUTARRS, mutlist_MVARS, mutlist_OTHERS;
 #endif
 
 #if defined(PROF_SPIN) && defined(THREADED_RTS)
-extern StgWord64 evac_collision;
+extern StgWord64 whitehole_spin;
 #endif
 
 void gcWorkerThread (Capability *cap);
@@ -56,4 +54,6 @@ void releaseGCThreads (Capability *cap);
 
 #define WORK_UNIT_WORDS 128
 
+END_RTS_PRIVATE
+
 #endif /* SM_GC_H */