src/share/vm/gc/cms/parNewGeneration.cpp

*** 565,589 ****
    // Finish the last termination pause.
    par_scan_state()->end_term_time();
  }
  
  ParNewGenTask::ParNewGenTask(ParNewGeneration* gen, Generation* old_gen,
!                              HeapWord* young_old_boundary, ParScanThreadStateSet* state_set) :
      AbstractGangTask("ParNewGeneration collection"),
      _gen(gen), _old_gen(old_gen),
      _young_old_boundary(young_old_boundary),
!     _state_set(state_set)
    {}
  
  // Reset the terminator for the given number of
  // active threads.
  void ParNewGenTask::set_for_termination(uint active_workers) {
    _state_set->reset(active_workers, _gen->promotion_failed());
-   // Should the heap be passed in?  There's only 1 for now so
-   // grab it instead.
-   GenCollectedHeap* gch = GenCollectedHeap::heap();
-   gch->set_n_termination(active_workers);
  }
  
  void ParNewGenTask::work(uint worker_id) {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    // Since this is being done in a separate thread, need new resource
--- 565,587 ----
    // Finish the last termination pause.
    par_scan_state()->end_term_time();
  }
  
  ParNewGenTask::ParNewGenTask(ParNewGeneration* gen, Generation* old_gen,
!                              HeapWord* young_old_boundary, ParScanThreadStateSet* state_set,
!                              StrongRootsScope* strong_roots_scope) :
      AbstractGangTask("ParNewGeneration collection"),
      _gen(gen), _old_gen(old_gen),
      _young_old_boundary(young_old_boundary),
!     _state_set(state_set),
!     _strong_roots_scope(strong_roots_scope)
    {}
  
  // Reset the terminator for the given number of
  // active threads.
  void ParNewGenTask::set_for_termination(uint active_workers) {
    _state_set->reset(active_workers, _gen->promotion_failed());
  }
  
  void ParNewGenTask::work(uint worker_id) {
    GenCollectedHeap* gch = GenCollectedHeap::heap();
    // Since this is being done in a separate thread, need new resource
*** 601,614 ****
    CLDToKlassAndOopClosure cld_scan_closure(&klass_scan_closure,
                                             &par_scan_state.to_space_root_closure(),
                                             false);
  
    par_scan_state.start_strong_roots();
!   gch->gen_process_roots(_gen->level(),
                           true,  // Process younger gens, if any,
                                  // as strong roots.
-                          false, // no scope; this is parallel code
                           GenCollectedHeap::SO_ScavengeCodeCache,
                           GenCollectedHeap::StrongAndWeakRoots,
                           &par_scan_state.to_space_root_closure(),
                           &par_scan_state.older_gen_closure(),
                           &cld_scan_closure);
--- 599,612 ----
    CLDToKlassAndOopClosure cld_scan_closure(&klass_scan_closure,
                                             &par_scan_state.to_space_root_closure(),
                                             false);
  
    par_scan_state.start_strong_roots();
!   gch->gen_process_roots(_strong_roots_scope,
!                          _gen->level(),
                           true,  // Process younger gens, if any,
                                  // as strong roots.
                           GenCollectedHeap::SO_ScavengeCodeCache,
                           GenCollectedHeap::StrongAndWeakRoots,
                           &par_scan_state.to_space_root_closure(),
                           &par_scan_state.older_gen_closure(),
                           &cld_scan_closure);
*** 836,846 ****
  
  void ParNewRefProcTaskExecutor::set_single_threaded_mode()
  {
    _state_set.flush();
    GenCollectedHeap* gch = GenCollectedHeap::heap();
-   gch->set_par_threads(0);  // 0 ==> non-parallel.
    gch->save_marks();
  }
  
  ScanClosureWithParBarrier::
  ScanClosureWithParBarrier(ParNewGeneration* g, bool gc_barrier) :
--- 834,843 ----
*** 950,973 ****
    ParallelTaskTerminator _term(n_workers, task_queues());
    ParScanThreadStateSet thread_state_set(workers->active_workers(),
                                           *to(), *this, *_old_gen, *task_queues(),
                                           _overflow_stacks, desired_plab_sz(), _term);
  
!   ParNewGenTask tsk(this, _old_gen, reserved().end(), &thread_state_set);
!   gch->set_par_threads(n_workers);
    gch->rem_set()->prepare_for_younger_refs_iterate(true);
    // It turns out that even when we're using 1 thread, doing the work in a
    // separate thread causes wide variance in run times.  We can't help this
    // in the multi-threaded case, but we special-case n=1 here to get
    // repeatable measurements of the 1-thread overhead of the parallel code.
    if (n_workers > 1) {
-     StrongRootsScope srs;
      workers->run_task(&tsk);
    } else {
-     StrongRootsScope srs;
      tsk.work(0);
    }
    thread_state_set.reset(0 /* Bad value in debug if not reset */,
                           promotion_failed());
  
    // Trace and reset failed promotion info.
    if (promotion_failed()) {
--- 947,972 ----
    ParallelTaskTerminator _term(n_workers, task_queues());
    ParScanThreadStateSet thread_state_set(workers->active_workers(),
                                           *to(), *this, *_old_gen, *task_queues(),
                                           _overflow_stacks, desired_plab_sz(), _term);
  
!   {
!     StrongRootsScope srs(n_workers);
! 
!     ParNewGenTask tsk(this, _old_gen, reserved().end(), &thread_state_set, &srs);
      gch->rem_set()->prepare_for_younger_refs_iterate(true);
      // It turns out that even when we're using 1 thread, doing the work in a
      // separate thread causes wide variance in run times.  We can't help this
      // in the multi-threaded case, but we special-case n=1 here to get
      // repeatable measurements of the 1-thread overhead of the parallel code.
      if (n_workers > 1) {
        workers->run_task(&tsk);
      } else {
        tsk.work(0);
      }
+   }
+ 
    thread_state_set.reset(0 /* Bad value in debug if not reset */,
                           promotion_failed());
  
    // Trace and reset failed promotion info.
    if (promotion_failed()) {
*** 993,1003 ****
      stats = rp->process_discovered_references(&is_alive, &keep_alive,
                                                &evacuate_followers, &task_executor,
                                                _gc_timer, _gc_tracer.gc_id());
    } else {
      thread_state_set.flush();
-     gch->set_par_threads(0);  // 0 ==> non-parallel.
      gch->save_marks();
      stats = rp->process_discovered_references(&is_alive, &keep_alive,
                                                &evacuate_followers, NULL,
                                                _gc_timer, _gc_tracer.gc_id());
    }
--- 992,1001 ----