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

rev 50285 : 8195097: Make it possible to process StringTable outside safepoint
Reviewed-by:

*** 52,61 ****
--- 52,62 ----
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
+ #include "gc/shared/oopStorageParState.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "gc/shared/strongRootsScope.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.hpp"
*** 2767,2780 ****
  // The common parts of CMSParInitialMarkTask and CMSParRemarkTask.
  class CMSParMarkTask : public AbstractGangTask {
   protected:
    CMSCollector*     _collector;
    uint              _n_workers;
    CMSParMarkTask(const char* name, CMSCollector* collector, uint n_workers) :
        AbstractGangTask(name),
        _collector(collector),
!       _n_workers(n_workers) {}
    // Work method in support of parallel rescan ... of young gen spaces
    void do_young_space_rescan(OopsInGenClosure* cl,
                               ContiguousSpace* space,
                               HeapWord** chunk_array, size_t chunk_top);
    void work_on_young_gen_roots(OopsInGenClosure* cl);
--- 2768,2783 ----
  // The common parts of CMSParInitialMarkTask and CMSParRemarkTask.
  class CMSParMarkTask : public AbstractGangTask {
   protected:
    CMSCollector*     _collector;
    uint              _n_workers;
+   OopStorage::ParState<false, false> _par_state_string;
    CMSParMarkTask(const char* name, CMSCollector* collector, uint n_workers) :
        AbstractGangTask(name),
        _collector(collector),
!       _n_workers(n_workers),
!       _par_state_string(StringTable::weak_storage()) {}
    // Work method in support of parallel rescan ... of young gen spaces
    void do_young_space_rescan(OopsInGenClosure* cl,
                               ContiguousSpace* space,
                               HeapWord** chunk_array, size_t chunk_top);
    void work_on_young_gen_roots(OopsInGenClosure* cl);
*** 4272,4282 ****
    heap->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);
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    _timer.stop();
    log_trace(gc, task)("Finished remaining root initial mark scan work in %dth thread: %3.3f sec", worker_id, _timer.seconds());
--- 4275,4287 ----
    heap->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,
!                           &_par_state_string);
! 
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    _timer.stop();
    log_trace(gc, task)("Finished remaining root initial mark scan work in %dth thread: %3.3f sec", worker_id, _timer.seconds());
*** 4401,4411 ****
    heap->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
  
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    _timer.stop();
--- 4406,4417 ----
    heap->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
!                           &_par_state_string);
  
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    _timer.stop();