src/share/vm/gc/serial/genMarkSweep.cpp

*** 68,78 ****
    assert(ref_processor() == NULL, "no stomping");
    assert(rp != NULL, "should be non-NULL");
    set_ref_processor(rp);
    rp->setup_policy(clear_all_softrefs);
  
!   GCTraceTime t1(GCCauseString("Full GC", gch->gc_cause()), PrintGC && !PrintGCDetails, true, NULL, _gc_tracer->gc_id());
  
    gch->trace_heap_before_gc(_gc_tracer);
  
    // When collecting the permanent generation Method*s may be moving,
    // so we either have to flush all bcp data or convert it into bci.
--- 68,78 ----
    assert(ref_processor() == NULL, "no stomping");
    assert(rp != NULL, "should be non-NULL");
    set_ref_processor(rp);
    rp->setup_policy(clear_all_softrefs);
  
!   GCTraceTime t1(GCCauseString("Full GC", gch->gc_cause()), PrintGC && !PrintGCDetails, true, NULL);
  
    gch->trace_heap_before_gc(_gc_tracer);
  
    // When collecting the permanent generation Method*s may be moving,
    // so we either have to flush all bcp data or convert it into bci.
*** 184,194 ****
    _objarray_stack.clear(true);
  }
  
  void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
    // Recursively traverse all live objects and mark them
!   GCTraceTime tm("phase 1", PrintGC && Verbose, true, _gc_timer, _gc_tracer->gc_id());
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
    // Because follow_root_closure is created statically, cannot
    // use OopsInGenClosure constructor which takes a generation,
--- 184,194 ----
    _objarray_stack.clear(true);
  }
  
  void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
    // Recursively traverse all live objects and mark them
!   GCTraceTime tm("phase 1", PrintGC && Verbose, true, _gc_timer);
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
    // Because follow_root_closure is created statically, cannot
    // use OopsInGenClosure constructor which takes a generation,
*** 215,225 ****
    // Process reference objects found during marking
    {
      ref_processor()->setup_policy(clear_all_softrefs);
      const ReferenceProcessorStats& stats =
        ref_processor()->process_discovered_references(
!         &is_alive, &keep_alive, &follow_stack_closure, NULL, _gc_timer, _gc_tracer->gc_id());
      gc_tracer()->report_gc_reference_stats(stats);
    }
  
    // This is the point where the entire marking should have completed.
    assert(_marking_stack.is_empty(), "Marking should have completed");
--- 215,225 ----
    // Process reference objects found during marking
    {
      ref_processor()->setup_policy(clear_all_softrefs);
      const ReferenceProcessorStats& stats =
        ref_processor()->process_discovered_references(
!         &is_alive, &keep_alive, &follow_stack_closure, NULL, _gc_timer);
      gc_tracer()->report_gc_reference_stats(stats);
    }
  
    // This is the point where the entire marking should have completed.
    assert(_marking_stack.is_empty(), "Marking should have completed");
*** 257,267 ****
    // phase2, phase3 and phase4, but the ValidateMarkSweep live oops
    // tracking expects us to do so. See comment under phase4.
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
!   GCTraceTime tm("phase 2", PrintGC && Verbose, true, _gc_timer, _gc_tracer->gc_id());
  
    gch->prepare_for_compaction();
  }
  
  class GenAdjustPointersClosure: public GenCollectedHeap::GenClosure {
--- 257,267 ----
    // phase2, phase3 and phase4, but the ValidateMarkSweep live oops
    // tracking expects us to do so. See comment under phase4.
  
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
!   GCTraceTime tm("phase 2", PrintGC && Verbose, true, _gc_timer);
  
    gch->prepare_for_compaction();
  }
  
  class GenAdjustPointersClosure: public GenCollectedHeap::GenClosure {
*** 273,283 ****
  
  void GenMarkSweep::mark_sweep_phase3() {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
    // Adjust the pointers to reflect the new locations
!   GCTraceTime tm("phase 3", PrintGC && Verbose, true, _gc_timer, _gc_tracer->gc_id());
  
    // Need new claim bits for the pointer adjustment tracing.
    ClassLoaderDataGraph::clear_claimed_marks();
  
    // Because the closure below is created statically, we cannot
--- 273,283 ----
  
  void GenMarkSweep::mark_sweep_phase3() {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
    // Adjust the pointers to reflect the new locations
!   GCTraceTime tm("phase 3", PrintGC && Verbose, true, _gc_timer);
  
    // Need new claim bits for the pointer adjustment tracing.
    ClassLoaderDataGraph::clear_claimed_marks();
  
    // Because the closure below is created statically, we cannot
*** 325,334 ****
    // in the same order in phase2, phase3 and phase4. We don't quite do that
    // here (perm_gen first rather than last), so we tell the validate code
    // to use a higher index (saved from phase2) when verifying perm_gen.
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
!   GCTraceTime tm("phase 4", PrintGC && Verbose, true, _gc_timer, _gc_tracer->gc_id());
  
    GenCompactClosure blk;
    gch->generation_iterate(&blk, true);
  }
--- 325,334 ----
    // in the same order in phase2, phase3 and phase4. We don't quite do that
    // here (perm_gen first rather than last), so we tell the validate code
    // to use a higher index (saved from phase2) when verifying perm_gen.
    GenCollectedHeap* gch = GenCollectedHeap::heap();
  
!   GCTraceTime tm("phase 4", PrintGC && Verbose, true, _gc_timer);
  
    GenCompactClosure blk;
    gch->generation_iterate(&blk, true);
  }