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

rev 11983 : 8166276: Refactor gen_process_roots to allow simpler fix for 8165949
Reviewed-by:
Contributed-by: jesper.wilhelmsson@oracle.com
rev 11985 : 8165949: Serial and ConcMarkSweep do not unload strings when class unloading is disabled
Reviewed-by:
rev 11986 : [mq]: 8165949-on-jesper-mik-rev

*** 2338,2348 ****
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->conc_process_roots(&srs,
                              true,   // young gen as roots
                              GenCollectedHeap::ScanningOption(roots_scanning_options()),
                              should_unload_classes(),
                              &notOlder,
                              NULL);
--- 2338,2348 ----
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->cms_process_roots(&srs,
                             true,   // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &notOlder,
                             NULL);
*** 2410,2420 ****
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->conc_process_roots(&srs,
                              true,   // young gen as roots
                              GenCollectedHeap::ScanningOption(roots_scanning_options()),
                              should_unload_classes(),
                              &notOlder,
                              &cld_closure);
--- 2410,2420 ----
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->cms_process_roots(&srs,
                             true,   // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &notOlder,
                             &cld_closure);
*** 2897,2907 ****
        CLDToOopClosure cld_closure(&notOlder, true);
        gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
        StrongRootsScope srs(1);
  
!       gch->conc_process_roots(&srs,
                                true,   // young gen as roots
                                GenCollectedHeap::ScanningOption(roots_scanning_options()),
                                should_unload_classes(),
                                &notOlder,
                                &cld_closure);
--- 2897,2907 ----
        CLDToOopClosure cld_closure(&notOlder, true);
        gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
        StrongRootsScope srs(1);
  
!       gch->cms_process_roots(&srs,
                               true,   // young gen as roots
                               GenCollectedHeap::ScanningOption(roots_scanning_options()),
                               should_unload_classes(),
                               &notOlder,
                               &cld_closure);
*** 4282,4292 ****
    _timer.reset();
    _timer.start();
  
    CLDToOopClosure cld_closure(&par_mri_cl, true);
  
!   gch->conc_process_roots(_strong_roots_scope,
                            false,     // yg was scanned above
                            GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                            _collector->should_unload_classes(),
                            &par_mri_cl,
                            &cld_closure);
--- 4282,4292 ----
    _timer.reset();
    _timer.start();
  
    CLDToOopClosure cld_closure(&par_mri_cl, true);
  
!   gch->cms_process_roots(_strong_roots_scope,
                           false,     // yg was scanned above
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mri_cl,
                           &cld_closure);
*** 4411,4421 ****
    }
  
    // ---------- remaining roots --------------
    _timer.reset();
    _timer.start();
!   gch->conc_process_roots(_strong_roots_scope,
                            false,     // yg was scanned above
                            GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                            _collector->should_unload_classes(),
                            &par_mrias_cl,
                            NULL);     // The dirty klasses will be handled below
--- 4411,4421 ----
    }
  
    // ---------- remaining roots --------------
    _timer.reset();
    _timer.start();
!   gch->cms_process_roots(_strong_roots_scope,
                           false,     // yg was scanned above
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mrias_cl,
                           NULL);     // The dirty klasses will be handled below
*** 4958,4968 ****
      verify_work_stacks_empty();
  
      gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
      StrongRootsScope srs(1);
  
!     gch->conc_process_roots(&srs,
                              true,  // young gen as roots
                              GenCollectedHeap::ScanningOption(roots_scanning_options()),
                              should_unload_classes(),
                              &mrias_cl,
                              NULL); // The dirty klasses will be handled below
--- 4958,4968 ----
      verify_work_stacks_empty();
  
      gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
      StrongRootsScope srs(1);
  
!     gch->cms_process_roots(&srs,
                             true,  // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &mrias_cl,
                             NULL); // The dirty klasses will be handled below