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

*** 60,70 ****
  class CMSConcMarkingTask;
  class CMSGCAdaptivePolicyCounters;
  class CMSTracer;
  class ConcurrentGCTimer;
  class ConcurrentMarkSweepGeneration;
- class ConcurrentMarkSweepPolicy;
  class ConcurrentMarkSweepThread;
  class CompactibleFreeListSpace;
  class FreeChunk;
  class ParNewGeneration;
  class PromotionInfo;
--- 60,69 ----
*** 586,599 ****
    // True if any verification flag is on.
    bool _verifying;
    bool verifying() const { return _verifying; }
    void set_verifying(bool v) { _verifying = v; }
  
-   // Collector policy
-   ConcurrentMarkSweepPolicy* _collector_policy;
-   ConcurrentMarkSweepPolicy* collector_policy() { return _collector_policy; }
- 
    void set_did_compact(bool v);
  
    // XXX Move these to CMSStats ??? FIX ME !!!
    elapsedTimer _inter_sweep_timer;   // Time between sweeps
    elapsedTimer _intra_sweep_timer;   // Time _in_ sweeps
--- 585,594 ----
*** 834,845 ****
    HeapWord* next_card_start_after_block(HeapWord* addr) const;
  
    void setup_cms_unloading_and_verification_state();
   public:
    CMSCollector(ConcurrentMarkSweepGeneration* cmsGen,
!                CardTableRS*                   ct,
!                ConcurrentMarkSweepPolicy*     cp);
    ConcurrentMarkSweepThread* cmsThread() { return _cmsThread; }
  
    ReferenceProcessor* ref_processor() { return _ref_processor; }
    void ref_processor_init();
  
--- 829,839 ----
    HeapWord* next_card_start_after_block(HeapWord* addr) const;
  
    void setup_cms_unloading_and_verification_state();
   public:
    CMSCollector(ConcurrentMarkSweepGeneration* cmsGen,
!                CardTableRS*                   ct);
    ConcurrentMarkSweepThread* cmsThread() { return _cmsThread; }
  
    ReferenceProcessor* ref_processor() { return _ref_processor; }
    void ref_processor_init();
  
*** 1074,1084 ****
    void expand_for_gc_cause(size_t bytes, size_t expand_bytes, CMSExpansionCause::Cause cause);
  
    void assert_correct_size_change_locking();
  
   public:
!   ConcurrentMarkSweepGeneration(ReservedSpace rs, size_t initial_byte_size, CardTableRS* ct);
  
    // Accessors
    CMSCollector* collector() const { return _collector; }
    static void set_collector(CMSCollector* collector) {
      assert(_collector == NULL, "already set");
--- 1068,1078 ----
    void expand_for_gc_cause(size_t bytes, size_t expand_bytes, CMSExpansionCause::Cause cause);
  
    void assert_correct_size_change_locking();
  
   public:
!   ConcurrentMarkSweepGeneration(ReservedSpace rs, size_t initial_byte_size, size_t min_byte_size, size_t max_byte_size, CardTableRS* ct);
  
    // Accessors
    CMSCollector* collector() const { return _collector; }
    static void set_collector(CMSCollector* collector) {
      assert(_collector == NULL, "already set");
*** 1215,1225 ****
    void print_statistics()               PRODUCT_RETURN;
  
    // Performance Counters support
    virtual void update_counters();
    virtual void update_counters(size_t used);
!   void initialize_performance_counters();
    CollectorCounters* counters()  { return collector()->counters(); }
  
    // Support for parallel remark of survivor space
    void* get_data_recorder(int thr_num) {
      //Delegate to collector
--- 1209,1219 ----
    void print_statistics()               PRODUCT_RETURN;
  
    // Performance Counters support
    virtual void update_counters();
    virtual void update_counters(size_t used);
!   void initialize_performance_counters(size_t min_byte_size, size_t max_byte_size);
    CollectorCounters* counters()  { return collector()->counters(); }
  
    // Support for parallel remark of survivor space
    void* get_data_recorder(int thr_num) {
      //Delegate to collector