diff options
author | Simon Marlow <marlowsd@gmail.com> | 2009-08-20 15:58:33 +0000 |
---|---|---|
committer | Simon Marlow <marlowsd@gmail.com> | 2009-08-20 15:58:33 +0000 |
commit | 0a19869b673f178786f127bc51451e1b7061772d (patch) | |
tree | fd150927f202e81753f5e4cce119089cddac4b1c /rts/Stats.c | |
parent | b99af8633eff2cba0128fa874e1ecbea0d1647fd (diff) | |
download | haskell-0a19869b673f178786f127bc51451e1b7061772d.tar.gz |
Rollback: use cas() to claim the closure in copyPart(), to match copy_tag()
rolling back:
* use cas() to claim the closure in copyPart(), to match copy_tag()
* rename whitehole_spin to evac_collision, and update it properly
This introduced a new failure in parallel GC. I'll rollback for now
until I've fixed it.
Diffstat (limited to 'rts/Stats.c')
-rw-r--r-- | rts/Stats.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/Stats.c b/rts/Stats.c index 4acdddab59..6029745368 100644 --- a/rts/Stats.c +++ b/rts/Stats.c @@ -15,7 +15,7 @@ #include "Profiling.h" #include "GetTime.h" #include "sm/Storage.h" -#include "sm/GC.h" // gc_alloc_block_sync, evac_collision +#include "sm/GC.h" // gc_alloc_block_sync, whitehole_spin #if USE_PAPI #include "Papi.h" @@ -704,7 +704,7 @@ stat_exit(int alloc) nat g, s; statsPrintf("gc_alloc_block_sync: %"FMT_Word64"\n", gc_alloc_block_sync.spin); - statsPrintf("evac_collision: %"FMT_Word64"\n", evac_collision); + statsPrintf("whitehole_spin: %"FMT_Word64"\n", whitehole_spin); for (g = 0; g < RtsFlags.GcFlags.generations; g++) { for (s = 0; s < generations[g].n_steps; s++) { statsPrintf("gen[%d].steps[%d].sync_large_objects: %"FMT_Word64"\n", g, s, generations[g].steps[s].sync_large_objects.spin); |