1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Sat Nov 23 09:56:59 2013 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Sat Nov 23 12:25:13 2013 +0100
1.3 @@ -56,6 +56,7 @@
1.4 #include "oops/oop.inline.hpp"
1.5 #include "oops/oop.pcgc.inline.hpp"
1.6 #include "runtime/vmThread.hpp"
1.7 +#include "utilities/ticks.hpp"
1.8
1.9 size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
1.10
1.11 @@ -1284,7 +1285,7 @@
1.12 }
1.13
1.14 STWGCTimer* gc_timer = G1MarkSweep::gc_timer();
1.15 - gc_timer->register_gc_start(os::elapsed_counter());
1.16 + gc_timer->register_gc_start();
1.17
1.18 SerialOldTracer* gc_tracer = G1MarkSweep::gc_tracer();
1.19 gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
1.20 @@ -1552,7 +1553,7 @@
1.21
1.22 post_full_gc_dump(gc_timer);
1.23
1.24 - gc_timer->register_gc_end(os::elapsed_counter());
1.25 + gc_timer->register_gc_end();
1.26 gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
1.27 }
1.28
1.29 @@ -2482,7 +2483,7 @@
1.30 FullGCCount_lock->notify_all();
1.31 }
1.32
1.33 -void G1CollectedHeap::register_concurrent_cycle_start(jlong start_time) {
1.34 +void G1CollectedHeap::register_concurrent_cycle_start(const Ticks& start_time) {
1.35 _concurrent_cycle_started = true;
1.36 _gc_timer_cm->register_gc_start(start_time);
1.37
1.38 @@ -2496,7 +2497,7 @@
1.39 _gc_tracer_cm->report_concurrent_mode_failure();
1.40 }
1.41
1.42 - _gc_timer_cm->register_gc_end(os::elapsed_counter());
1.43 + _gc_timer_cm->register_gc_end();
1.44 _gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
1.45
1.46 _concurrent_cycle_started = false;
1.47 @@ -3887,7 +3888,7 @@
1.48 return false;
1.49 }
1.50
1.51 - _gc_timer_stw->register_gc_start(os::elapsed_counter());
1.52 + _gc_timer_stw->register_gc_start();
1.53
1.54 _gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
1.55
1.56 @@ -4265,7 +4266,7 @@
1.57
1.58 _gc_tracer_stw->report_evacuation_info(&evacuation_info);
1.59 _gc_tracer_stw->report_tenuring_threshold(_g1_policy->tenuring_threshold());
1.60 - _gc_timer_stw->register_gc_end(os::elapsed_counter());
1.61 + _gc_timer_stw->register_gc_end();
1.62 _gc_tracer_stw->report_gc_end(_gc_timer_stw->gc_end(), _gc_timer_stw->time_partitions());
1.63 }
1.64 // It should now be safe to tell the concurrent mark thread to start
