# HG changeset patch # User brutisso # Date 1450084954 -3600 # Mon Dec 14 10:22:34 2015 +0100 # Node ID c25e4db841619455df24eb90aa177b104a8c15de # Parent d6c6ee9d40b089dea64042926c09e70e3bff6f3e [mq]: double-jlong diff --git a/src/share/vm/gc/g1/g1CollectedHeap.cpp b/src/share/vm/gc/g1/g1CollectedHeap.cpp --- a/src/share/vm/gc/g1/g1CollectedHeap.cpp +++ b/src/share/vm/gc/g1/g1CollectedHeap.cpp @@ -3616,7 +3616,7 @@ } #endif // TASKQUEUE_STATS -void G1CollectedHeap::log_gc_footer(double pause_time_counter) { +void G1CollectedHeap::log_gc_footer(jlong pause_time_counter) { if (evacuation_failed()) { log_info(gc)("To-space exhausted"); } @@ -3715,7 +3715,7 @@ GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true); double pause_start_sec = os::elapsedTime(); - double pause_start_counter = os::elapsed_counter(); + jlong pause_start_counter = os::elapsed_counter(); g1_policy()->note_gc_start(active_workers); TraceCollectorStats tcs(g1mm()->incremental_collection_counters()); diff --git a/src/share/vm/gc/g1/g1CollectedHeap.hpp b/src/share/vm/gc/g1/g1CollectedHeap.hpp --- a/src/share/vm/gc/g1/g1CollectedHeap.hpp +++ b/src/share/vm/gc/g1/g1CollectedHeap.hpp @@ -290,7 +290,7 @@ void verify_before_gc(); void verify_after_gc(); - void log_gc_footer(double pause_time_counter); + void log_gc_footer(jlong pause_time_counter); void trace_heap(GCWhen::Type when, const GCTracer* tracer); # HG changeset patch # User brutisso # Date 1450085122 -3600 # Mon Dec 14 10:25:22 2015 +0100 # Node ID 6f03e879ca83918c21406c40cf64ceca6c783ad6 # Parent c25e4db841619455df24eb90aa177b104a8c15de [mq]: sec-ms diff --git a/src/share/vm/gc/g1/g1CollectedHeap.cpp b/src/share/vm/gc/g1/g1CollectedHeap.cpp --- a/src/share/vm/gc/g1/g1CollectedHeap.cpp +++ b/src/share/vm/gc/g1/g1CollectedHeap.cpp @@ -3621,8 +3621,8 @@ log_info(gc)("To-space exhausted"); } - double pause_time_sec = TimeHelper::counter_to_seconds(pause_time_counter); - g1_policy()->print_phases(pause_time_sec); + double pause_time_ms = TimeHelper::counter_to_millis(pause_time_counter); + g1_policy()->print_phases(pause_time_ms); g1_policy()->print_detailed_heap_transition(); } diff --git a/src/share/vm/gc/g1/g1CollectorPolicy.cpp b/src/share/vm/gc/g1/g1CollectorPolicy.cpp --- a/src/share/vm/gc/g1/g1CollectorPolicy.cpp +++ b/src/share/vm/gc/g1/g1CollectorPolicy.cpp @@ -1299,8 +1299,8 @@ MetaspaceAux::print_metaspace_change(_metaspace_used_bytes_before_gc); } -void G1CollectorPolicy::print_phases(double pause_time_sec) { - phase_times()->print(pause_time_sec); +void G1CollectorPolicy::print_phases(double pause_time_ms) { + phase_times()->print(pause_time_ms); } void G1CollectorPolicy::adjust_concurrent_refinement(double update_rs_time, diff --git a/src/share/vm/gc/g1/g1CollectorPolicy.hpp b/src/share/vm/gc/g1/g1CollectorPolicy.hpp --- a/src/share/vm/gc/g1/g1CollectorPolicy.hpp +++ b/src/share/vm/gc/g1/g1CollectorPolicy.hpp @@ -661,7 +661,7 @@ void print_detailed_heap_transition() const; - virtual void print_phases(double pause_time_sec); + virtual void print_phases(double pause_time_ms); void record_stop_world_start(); void record_concurrent_pause(); diff --git a/src/share/vm/gc/g1/g1GCPhaseTimes.cpp b/src/share/vm/gc/g1/g1GCPhaseTimes.cpp --- a/src/share/vm/gc/g1/g1GCPhaseTimes.cpp +++ b/src/share/vm/gc/g1/g1GCPhaseTimes.cpp @@ -349,7 +349,7 @@ } }; -void G1GCPhaseTimes::print(double pause_time_sec) { +void G1GCPhaseTimes::print(double pause_time_ms) { note_gc_end(); G1GCParPhasePrinter par_phase_printer(this); @@ -373,7 +373,7 @@ } print_stats(Indents[1], "Clear CT", _cur_clear_ct_time_ms); print_stats(Indents[1], "Expand Heap After Collection", _cur_expand_heap_time_ms); - double misc_time_ms = pause_time_sec * MILLIUNITS - accounted_time_ms(); + double misc_time_ms = pause_time_ms - accounted_time_ms(); print_stats(Indents[1], "Other", misc_time_ms); if (_cur_verify_before_time_ms > 0.0) { print_stats(Indents[2], "Verify Before", _cur_verify_before_time_ms); diff --git a/src/share/vm/gc/g1/g1GCPhaseTimes.hpp b/src/share/vm/gc/g1/g1GCPhaseTimes.hpp --- a/src/share/vm/gc/g1/g1GCPhaseTimes.hpp +++ b/src/share/vm/gc/g1/g1GCPhaseTimes.hpp @@ -126,7 +126,7 @@ public: G1GCPhaseTimes(uint max_gc_threads); void note_gc_start(uint active_gc_threads); - void print(double pause_time_sec); + void print(double pause_time_ms); // record the time a phase took in seconds void record_time_secs(GCParPhases phase, uint worker_i, double secs);