Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Wed Jun 25 15:51:15 2014 -0700
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Thu Jun 19 13:31:14 2014 +0200
     1.3 @@ -169,7 +169,7 @@
     1.4  
     1.5      gclog_or_tty->date_stamp(PrintGC && PrintGCDateStamps);
     1.6      TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
     1.7 -    GCTraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, NULL);
     1.8 +    GCTraceTime t1(GCCauseString("Full GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer->gc_id());
     1.9      TraceCollectorStats tcs(counters());
    1.10      TraceMemoryManagerStats tms(true /* Full GC */,gc_cause);
    1.11  
    1.12 @@ -513,7 +513,7 @@
    1.13  
    1.14  void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
    1.15    // Recursively traverse all live objects and mark them
    1.16 -  GCTraceTime tm("phase 1", PrintGCDetails && Verbose, true, _gc_timer);
    1.17 +  GCTraceTime tm("phase 1", PrintGCDetails && Verbose, true, _gc_timer, _gc_tracer->gc_id());
    1.18    trace(" 1");
    1.19  
    1.20    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    1.21 @@ -548,7 +548,7 @@
    1.22      ref_processor()->setup_policy(clear_all_softrefs);
    1.23      const ReferenceProcessorStats& stats =
    1.24        ref_processor()->process_discovered_references(
    1.25 -        is_alive_closure(), mark_and_push_closure(), follow_stack_closure(), NULL, _gc_timer);
    1.26 +        is_alive_closure(), mark_and_push_closure(), follow_stack_closure(), NULL, _gc_timer, _gc_tracer->gc_id());
    1.27      gc_tracer()->report_gc_reference_stats(stats);
    1.28    }
    1.29  
    1.30 @@ -574,7 +574,7 @@
    1.31  
    1.32  
    1.33  void PSMarkSweep::mark_sweep_phase2() {
    1.34 -  GCTraceTime tm("phase 2", PrintGCDetails && Verbose, true, _gc_timer);
    1.35 +  GCTraceTime tm("phase 2", PrintGCDetails && Verbose, true, _gc_timer, _gc_tracer->gc_id());
    1.36    trace("2");
    1.37  
    1.38    // Now all live objects are marked, compute the new object addresses.
    1.39 @@ -604,7 +604,7 @@
    1.40  
    1.41  void PSMarkSweep::mark_sweep_phase3() {
    1.42    // Adjust the pointers to reflect the new locations
    1.43 -  GCTraceTime tm("phase 3", PrintGCDetails && Verbose, true, _gc_timer);
    1.44 +  GCTraceTime tm("phase 3", PrintGCDetails && Verbose, true, _gc_timer, _gc_tracer->gc_id());
    1.45    trace("3");
    1.46  
    1.47    ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    1.48 @@ -647,7 +647,7 @@
    1.49  
    1.50  void PSMarkSweep::mark_sweep_phase4() {
    1.51    EventMark m("4 compact heap");
    1.52 -  GCTraceTime tm("phase 4", PrintGCDetails && Verbose, true, _gc_timer);
    1.53 +  GCTraceTime tm("phase 4", PrintGCDetails && Verbose, true, _gc_timer, _gc_tracer->gc_id());
    1.54    trace("4");
    1.55  
    1.56    // All pointers are now adjusted, move objects accordingly