Fri, 17 May 2013 17:24:20 +0200
7176220: 'Full GC' events miss date stamp information occasionally
Summary: Move date stamp logic into GCTraceTime
Reviewed-by: brutisso, tschatzl
1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Mar 02 11:08:09 2015 +0100 1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Fri May 17 17:24:20 2013 +0200 1.3 @@ -6634,7 +6634,6 @@ 1.4 } 1.5 1.6 void CMSCollector::do_CMS_operation(CMS_op_type op, GCCause::Cause gc_cause) { 1.7 - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); 1.8 TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); 1.9 GCTraceTime t(GCCauseString("GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer_cm->gc_id()); 1.10 TraceCollectorStats tcs(counters());
2.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Mon Mar 02 11:08:09 2015 +0100 2.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Fri May 17 17:24:20 2013 +0200 2.3 @@ -1297,7 +1297,6 @@ 2.4 2.5 // Timing 2.6 assert(gc_cause() != GCCause::_java_lang_system_gc || explicit_gc, "invariant"); 2.7 - gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps); 2.8 TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty); 2.9 2.10 {
3.1 --- a/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Mon Mar 02 11:08:09 2015 +0100 3.2 +++ b/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp Fri May 17 17:24:20 2013 +0200 3.3 @@ -230,7 +230,6 @@ 3.4 } 3.5 3.6 void VM_CGC_Operation::doit() { 3.7 - gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps); 3.8 TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty); 3.9 GCTraceTime t(_printGCMessage, G1Log::fine(), true, G1CollectedHeap::heap()->gc_timer_cm(), G1CollectedHeap::heap()->concurrent_mark()->concurrent_gc_id()); 3.10 SharedHeap* sh = SharedHeap::heap();
4.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Mon Mar 02 11:08:09 2015 +0100 4.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Fri May 17 17:24:20 2013 +0200 4.3 @@ -167,7 +167,6 @@ 4.4 { 4.5 HandleMark hm; 4.6 4.7 - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); 4.8 TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); 4.9 GCTraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer->gc_id()); 4.10 TraceCollectorStats tcs(counters());
5.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Mon Mar 02 11:08:09 2015 +0100 5.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Fri May 17 17:24:20 2013 +0200 5.3 @@ -2054,7 +2054,6 @@ 5.4 gc_task_manager()->task_idle_workers(); 5.5 heap->set_par_threads(gc_task_manager()->active_workers()); 5.6 5.7 - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); 5.8 TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); 5.9 GCTraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer.gc_id()); 5.10 TraceCollectorStats tcs(counters());
6.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Mon Mar 02 11:08:09 2015 +0100 6.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp Fri May 17 17:24:20 2013 +0200 6.3 @@ -329,7 +329,6 @@ 6.4 ResourceMark rm; 6.5 HandleMark hm; 6.6 6.7 - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); 6.8 TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); 6.9 GCTraceTime t1(GCCauseString("GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer.gc_id()); 6.10 TraceCollectorStats tcs(counters());
7.1 --- a/src/share/vm/gc_implementation/shared/gcTraceTime.cpp Mon Mar 02 11:08:09 2015 +0100 7.2 +++ b/src/share/vm/gc_implementation/shared/gcTraceTime.cpp Fri May 17 17:24:20 2013 +0200 7.3 @@ -49,10 +49,8 @@ 7.4 } 7.5 7.6 if (_doit) { 7.7 - if (PrintGCTimeStamps) { 7.8 - gclog_or_tty->stamp(); 7.9 - gclog_or_tty->print(": "); 7.10 - } 7.11 + gclog_or_tty->date_stamp(PrintGCDateStamps); 7.12 + gclog_or_tty->stamp(PrintGCTimeStamps); 7.13 if (PrintGCID) { 7.14 gclog_or_tty->print("#%u: ", gc_id.id()); 7.15 }
8.1 --- a/src/share/vm/memory/genCollectedHeap.cpp Mon Mar 02 11:08:09 2015 +0100 8.2 +++ b/src/share/vm/memory/genCollectedHeap.cpp Fri May 17 17:24:20 2013 +0200 8.3 @@ -384,7 +384,6 @@ 8.4 8.5 bool complete = full && (max_level == (n_gens()-1)); 8.6 const char* gc_cause_prefix = complete ? "Full GC" : "GC"; 8.7 - gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps); 8.8 TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty); 8.9 // The PrintGCDetails logging starts before we have incremented the GC id. We will do that later 8.10 // so we can assume here that the next GC id is what we want.