update the debug counters following changes to scav_find_work()

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index dc51465..4d0c4ef 100644 (file)
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -466,8 +466,7 @@ GarbageCollect ( rtsBool force_major_gc )
               trace(TRACE_gc,"   copied           %ld", gc_threads[i]->copied * sizeof(W_));
               trace(TRACE_gc,"   any_work         %ld", gc_threads[i]->any_work);
               trace(TRACE_gc,"   no_work          %ld", gc_threads[i]->no_work);
-              trace(TRACE_gc,"   scav_global_work %ld", gc_threads[i]->scav_global_work);
-              trace(TRACE_gc,"   scav_local_work  %ld", gc_threads[i]->scav_local_work);
+              trace(TRACE_gc,"   scav_find_work %ld",   gc_threads[i]->scav_find_work);
           }
           copied += gc_threads[i]->copied;
       }
@@ -1411,8 +1410,7 @@ init_gc_thread (gc_thread *t)
     t->copied = 0;
     t->any_work = 0;
     t->no_work = 0;
-    t->scav_global_work = 0;
-    t->scav_local_work = 0;
+    t->scav_find_work = 0;
 
 }
 

diff --git a/rts/sm/GC.h b/rts/sm/GC.h
index 612da64..5c2bff9 100644 (file)
--- a/rts/sm/GC.h
+++ b/rts/sm/GC.h
@@ -156,8 +156,7 @@ typedef struct gc_thread_ {
     lnat copied;
     lnat any_work;
     lnat no_work;
-    lnat scav_global_work;
-    lnat scav_local_work;
+    lnat scav_find_work;
 
     // -------------------
     // workspaces

diff --git a/rts/sm/Scav.c b/rts/sm/Scav.c
index 83890cb..6eba1e0 100644 (file)
--- a/rts/sm/Scav.c
+++ b/rts/sm/Scav.c
@@ -1417,7 +1417,7 @@ scavenge_find_work (void)
     rtsBool did_something, did_anything;
     bdescr *bd;
 
-    gct->scav_local_work++;
+    gct->scav_find_work++;
 
     did_anything = rtsFalse;