Specialise evac/scav for single-threaded, not minor, GC

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

diff --git a/rts/sm/GC.h b/rts/sm/GC.h
index 5183837..612da64 100644 (file)
--- a/rts/sm/GC.h
+++ b/rts/sm/GC.h
@@ -120,6 +120,9 @@ typedef struct gc_thread_ {
                                    //  during GC without accessing the block
                                    //   allocators spin lock. 
 
+    StgClosure* static_objects;      // live static objects
+    StgClosure* scavenged_static_objects;   // static objects scavenged so far
+
     lnat gc_count;                 // number of gc's this thread has done
 
     // --------------------
@@ -152,6 +155,7 @@ typedef struct gc_thread_ {
 
     lnat copied;
     lnat any_work;
+    lnat no_work;
     lnat scav_global_work;
     lnat scav_local_work;
 
@@ -168,14 +172,12 @@ typedef struct gc_thread_ {
 
 extern nat N;
 extern rtsBool major_gc;
+extern nat n_gc_threads;
 
 extern gc_thread **gc_threads;
 register gc_thread *gct __asm__("%rbx");
 // extern gc_thread *gct;  // this thread's gct TODO: make thread-local
 
-extern StgClosure* static_objects;
-extern StgClosure* scavenged_static_objects;
-
 extern bdescr *mark_stack_bdescr;
 extern StgPtr *mark_stack;
 extern StgPtr *mark_sp;
@@ -187,10 +189,6 @@ extern StgPtr  oldgen_scan;
 
 extern long copied;
 
-#ifdef THREADED_RTS
-extern SpinLock static_objects_sync;
-#endif
-
 #ifdef DEBUG
 extern nat mutlist_MUTVARS, mutlist_MUTARRS, mutlist_MVARS, mutlist_OTHERS;
 #endif