1.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp Fri Jul 13 14:16:21 2012 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp Mon Jul 16 13:00:26 2012 -0700
1.3 @@ -29,6 +29,7 @@
1.4 #include "gc_implementation/g1/g1BlockOffsetTable.inline.hpp"
1.5 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
1.6 #include "gc_implementation/g1/g1CollectorPolicy.hpp"
1.7 +#include "gc_implementation/g1/g1GCPhaseTimes.hpp"
1.8 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
1.9 #include "gc_implementation/g1/g1RemSet.inline.hpp"
1.10 #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
1.11 @@ -224,7 +225,7 @@
1.12 assert( _cards_scanned != NULL, "invariant" );
1.13 _cards_scanned[worker_i] = scanRScl.cards_done();
1.14
1.15 - _g1p->record_scan_rs_time(worker_i, scan_rs_time_sec * 1000.0);
1.16 + _g1p->phase_times()->record_scan_rs_time(worker_i, scan_rs_time_sec * 1000.0);
1.17 }
1.18
1.19 // Closure used for updating RSets and recording references that
1.20 @@ -276,7 +277,7 @@
1.21 guarantee(cl.n() == 0, "Card table should be clean.");
1.22 }
1.23
1.24 - _g1p->record_update_rs_time(worker_i, (os::elapsedTime() - start) * 1000.0);
1.25 + _g1p->phase_times()->record_update_rs_time(worker_i, (os::elapsedTime() - start) * 1000.0);
1.26 }
1.27
1.28 class CountRSSizeClosure: public HeapRegionClosure {
1.29 @@ -390,13 +391,13 @@
1.30 if (G1UseParallelRSetUpdating || (worker_i == 0)) {
1.31 updateRS(&into_cset_dcq, worker_i);
1.32 } else {
1.33 - _g1p->record_update_rs_processed_buffers(worker_i, 0.0);
1.34 - _g1p->record_update_rs_time(worker_i, 0.0);
1.35 + _g1p->phase_times()->record_update_rs_processed_buffers(worker_i, 0.0);
1.36 + _g1p->phase_times()->record_update_rs_time(worker_i, 0.0);
1.37 }
1.38 if (G1UseParallelRSetScanning || (worker_i == 0)) {
1.39 scanRS(oc, worker_i);
1.40 } else {
1.41 - _g1p->record_scan_rs_time(worker_i, 0.0);
1.42 + _g1p->phase_times()->record_scan_rs_time(worker_i, 0.0);
1.43 }
1.44
1.45 // We now clear the cached values of _cset_rs_update_cl for this worker
