src/share/vm/gc/parallel/psScavenge.cpp

*** 34,43 ****
--- 34,44 ----
  #include "gc/parallel/psScavenge.inline.hpp"
  #include "gc/parallel/psTasks.hpp"
  #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/gcCause.hpp"
  #include "gc/shared/gcHeapSummary.hpp"
+ #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcLocker.inline.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
*** 276,285 ****
--- 277,287 ----
    // Check for potential problems.
    if (!should_attempt_scavenge()) {
      return false;
    }
  
+   GCIdMark gc_id_mark;
    _gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start());
  
    bool promotion_failure_occurred = false;
  
    PSYoungGen* young_gen = heap->young_gen();
*** 320,330 ****
    {
      ResourceMark rm;
      HandleMark hm;
  
      TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
!     GCTraceTime t1(GCCauseString("GC", gc_cause), PrintGC, !PrintGCDetails, NULL, _gc_tracer.gc_id());
      TraceCollectorStats tcs(counters());
      TraceMemoryManagerStats tms(false /* not full GC */,gc_cause);
  
      if (TraceYoungGenTime) accumulated_time()->start();
  
--- 322,332 ----
    {
      ResourceMark rm;
      HandleMark hm;
  
      TraceCPUTime tcpu(PrintGCDetails, true, gclog_or_tty);
!     GCTraceTime t1(GCCauseString("GC", gc_cause), PrintGC, !PrintGCDetails, NULL);
      TraceCollectorStats tcs(counters());
      TraceMemoryManagerStats tms(false /* not full GC */,gc_cause);
  
      if (TraceYoungGenTime) accumulated_time()->start();
  
*** 385,395 ****
      PSPromotionManager::pre_scavenge();
  
      // We'll use the promotion manager again later.
      PSPromotionManager* promotion_manager = PSPromotionManager::vm_thread_promotion_manager();
      {
!       GCTraceTime tm("Scavenge", false, false, &_gc_timer, _gc_tracer.gc_id());
        ParallelScavengeHeap::ParStrongRootsScope psrs;
  
        GCTaskQueue* q = GCTaskQueue::create();
  
        if (!old_gen->object_space()->is_empty()) {
--- 387,397 ----
      PSPromotionManager::pre_scavenge();
  
      // We'll use the promotion manager again later.
      PSPromotionManager* promotion_manager = PSPromotionManager::vm_thread_promotion_manager();
      {
!       GCTraceTime tm("Scavenge", false, false, &_gc_timer);
        ParallelScavengeHeap::ParStrongRootsScope psrs;
  
        GCTaskQueue* q = GCTaskQueue::create();
  
        if (!old_gen->object_space()->is_empty()) {
*** 427,451 ****
  
      scavenge_midpoint.update();
  
      // Process reference objects discovered during scavenge
      {
!       GCTraceTime tm("References", false, false, &_gc_timer, _gc_tracer.gc_id());
  
        reference_processor()->setup_policy(false); // not always_clear
        reference_processor()->set_active_mt_degree(active_workers);
        PSKeepAliveClosure keep_alive(promotion_manager);
        PSEvacuateFollowersClosure evac_followers(promotion_manager);
        ReferenceProcessorStats stats;
        if (reference_processor()->processing_is_mt()) {
          PSRefProcTaskExecutor task_executor;
          stats = reference_processor()->process_discovered_references(
            &_is_alive_closure, &keep_alive, &evac_followers, &task_executor,
!           &_gc_timer, _gc_tracer.gc_id());
        } else {
          stats = reference_processor()->process_discovered_references(
!           &_is_alive_closure, &keep_alive, &evac_followers, NULL, &_gc_timer, _gc_tracer.gc_id());
        }
  
        _gc_tracer.report_gc_reference_stats(stats);
  
        // Enqueue reference objects discovered during scavenge.
--- 429,453 ----
  
      scavenge_midpoint.update();
  
      // Process reference objects discovered during scavenge
      {
!       GCTraceTime tm("References", false, false, &_gc_timer);
  
        reference_processor()->setup_policy(false); // not always_clear
        reference_processor()->set_active_mt_degree(active_workers);
        PSKeepAliveClosure keep_alive(promotion_manager);
        PSEvacuateFollowersClosure evac_followers(promotion_manager);
        ReferenceProcessorStats stats;
        if (reference_processor()->processing_is_mt()) {
          PSRefProcTaskExecutor task_executor;
          stats = reference_processor()->process_discovered_references(
            &_is_alive_closure, &keep_alive, &evac_followers, &task_executor,
!           &_gc_timer);
        } else {
          stats = reference_processor()->process_discovered_references(
!           &_is_alive_closure, &keep_alive, &evac_followers, NULL, &_gc_timer);
        }
  
        _gc_tracer.report_gc_reference_stats(stats);
  
        // Enqueue reference objects discovered during scavenge.
*** 456,466 ****
          reference_processor()->enqueue_discovered_references(NULL);
        }
      }
  
      {
!       GCTraceTime tm("StringTable", false, false, &_gc_timer, _gc_tracer.gc_id());
        // Unlink any dead interned Strings and process the remaining live ones.
        PSScavengeRootsClosure root_closure(promotion_manager);
        StringTable::unlink_or_oops_do(&_is_alive_closure, &root_closure);
      }
  
--- 458,468 ----
          reference_processor()->enqueue_discovered_references(NULL);
        }
      }
  
      {
!       GCTraceTime tm("StringTable", false, false, &_gc_timer);
        // Unlink any dead interned Strings and process the remaining live ones.
        PSScavengeRootsClosure root_closure(promotion_manager);
        StringTable::unlink_or_oops_do(&_is_alive_closure, &root_closure);
      }
  
*** 626,636 ****
      COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
  
      NOT_PRODUCT(reference_processor()->verify_no_references_recorded());
  
      {
!       GCTraceTime tm("Prune Scavenge Root Methods", false, false, &_gc_timer, _gc_tracer.gc_id());
  
        CodeCache::prune_scavenge_root_nmethods();
      }
  
      // Re-verify object start arrays
--- 628,638 ----
      COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
  
      NOT_PRODUCT(reference_processor()->verify_no_references_recorded());
  
      {
!       GCTraceTime tm("Prune Scavenge Root Methods", false, false, &_gc_timer);
  
        CodeCache::prune_scavenge_root_nmethods();
      }
  
      // Re-verify object start arrays