src/hotspot/share/gc/g1/g1ConcurrentMark.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

*** 37,47 ****
  #include "gc/g1/g1StringDedup.hpp"
  #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/heapRegionSet.inline.hpp"
- #include "gc/shared/adaptiveSizePolicy.hpp"
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTrace.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
--- 37,46 ----
*** 49,58 ****
--- 48,58 ----
  #include "gc/shared/strongRootsScope.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/vmGCOperations.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
+ #include "gc/shared/workerPolicy.hpp"
  #include "include/jvm.h"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/access.inline.hpp"
*** 843,853 ****
        (!FLAG_IS_DEFAULT(ConcGCThreads) &&
         !ForceDynamicNumberOfGCThreads)) {
      result = _max_concurrent_workers;
    } else {
      result =
!       AdaptiveSizePolicy::calc_default_active_workers(_max_concurrent_workers,
                                                        1, /* Minimum workers */
                                                        _num_concurrent_workers,
                                                        Threads::number_of_non_daemon_threads());
      // Don't scale the result down by scale_concurrent_workers() because
      // that scaling has already gone into "_max_concurrent_workers".
--- 843,853 ----
        (!FLAG_IS_DEFAULT(ConcGCThreads) &&
         !ForceDynamicNumberOfGCThreads)) {
      result = _max_concurrent_workers;
    } else {
      result =
!       WorkerPolicy::calc_default_active_workers(_max_concurrent_workers,
                                                  1, /* Minimum workers */
                                                  _num_concurrent_workers,
                                                  Threads::number_of_non_daemon_threads());
      // Don't scale the result down by scale_concurrent_workers() because
      // that scaling has already gone into "_max_concurrent_workers".