summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <simonmarhaskell@gmail.com>2008-04-16 21:59:45 +0000
committerSimon Marlow <simonmarhaskell@gmail.com>2008-04-16 21:59:45 +0000
commit902be381a29af801582c93366528f7901a5da544 (patch)
treefec9343eba1810ca5f18894ce147d1c381c4455c
parent509b3987c361fef9715b646c8ac738ef8d2279cf (diff)
downloadhaskell-902be381a29af801582c93366528f7901a5da544.tar.gz
update the debug counters following changes to scav_find_work()
-rw-r--r--rts/sm/GC.c6
-rw-r--r--rts/sm/GC.h3
-rw-r--r--rts/sm/Scav.c2
3 files changed, 4 insertions, 7 deletions
diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index dc514652c3..4d0c4ef613 100644
--- 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 612da64bf2..5c2bff96f7 100644
--- 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 83890cbabe..6eba1e01a9 100644
--- 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;