src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 52689 : 8213224: Move code related to GC threads calculation out of AdaptiveSizePolicy
Summary: Consolidate code related to GC threads calculation into a single class

*** 59,69 ****
  #include "gc/g1/g1YoungRemSetSamplingThread.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/heapRegionSet.inline.hpp"
  #include "gc/g1/vm_operations_g1.hpp"
- #include "gc/shared/adaptiveSizePolicy.hpp"
  #include "gc/shared/gcBehaviours.hpp"
  #include "gc/shared/gcHeapSummary.hpp"
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "gc/shared/gcTimer.hpp"
--- 59,68 ----
*** 76,85 ****
--- 75,85 ----
  #include "gc/shared/preservedMarks.inline.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/referenceProcessor.inline.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
+ #include "gc/shared/workerPolicy.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  #include "memory/iterator.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/access.inline.hpp"
*** 2898,2908 ****
        gc_string.append("(Mixed)");
        verify_type = G1HeapVerifier::G1VerifyMixed;
      }
      GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
  
!     uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
                                                                    workers()->active_workers(),
                                                                    Threads::number_of_non_daemon_threads());
      active_workers = workers()->update_active_workers(active_workers);
      log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());
  
--- 2898,2908 ----
        gc_string.append("(Mixed)");
        verify_type = G1HeapVerifier::G1VerifyMixed;
      }
      GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
  
!     uint active_workers = WorkerPolicy::calc_active_workers(workers()->total_workers(),
                                                              workers()->active_workers(),
                                                              Threads::number_of_non_daemon_threads());
      active_workers = workers()->update_active_workers(active_workers);
      log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());