src/share/vm/gc/cms/parNewGeneration.hpp

*** 232,249 ****
    }
  };
  
  class ParNewGenTask: public AbstractGangTask {
   private:
!   ParNewGeneration*            _gen;
    Generation*                  _old_gen;
    HeapWord*                    _young_old_boundary;
    class ParScanThreadStateSet* _state_set;
    StrongRootsScope*            _strong_roots_scope;
  
  public:
!   ParNewGenTask(ParNewGeneration*      gen,
                  Generation*            old_gen,
                  HeapWord*              young_old_boundary,
                  ParScanThreadStateSet* state_set,
                  StrongRootsScope*      strong_roots_scope);
  
--- 232,249 ----
    }
  };
  
  class ParNewGenTask: public AbstractGangTask {
   private:
!   ParNewGeneration*            _young_gen;
    Generation*                  _old_gen;
    HeapWord*                    _young_old_boundary;
    class ParScanThreadStateSet* _state_set;
    StrongRootsScope*            _strong_roots_scope;
  
  public:
!   ParNewGenTask(ParNewGeneration*      young_gen,
                  Generation*            old_gen,
                  HeapWord*              young_old_boundary,
                  ParScanThreadStateSet* state_set,
                  StrongRootsScope*      strong_roots_scope);
  
*** 262,276 ****
  };
  
  class EvacuateFollowersClosureGeneral: public VoidClosure {
   private:
    GenCollectedHeap* _gch;
-   int               _level;
    OopsInGenClosure* _scan_cur_or_nonheap;
    OopsInGenClosure* _scan_older;
   public:
!   EvacuateFollowersClosureGeneral(GenCollectedHeap* gch, int level,
                                    OopsInGenClosure* cur,
                                    OopsInGenClosure* older);
    virtual void do_void();
  };
  
--- 262,275 ----
  };
  
  class EvacuateFollowersClosureGeneral: public VoidClosure {
   private:
    GenCollectedHeap* _gch;
    OopsInGenClosure* _scan_cur_or_nonheap;
    OopsInGenClosure* _scan_older;
   public:
!   EvacuateFollowersClosureGeneral(GenCollectedHeap* gch,
                                    OopsInGenClosure* cur,
                                    OopsInGenClosure* older);
    virtual void do_void();
  };
  
*** 286,301 ****
  };
  
  // Implements AbstractRefProcTaskExecutor for ParNew.
  class ParNewRefProcTaskExecutor: public AbstractRefProcTaskExecutor {
   private:
!   ParNewGeneration&      _generation;
    ParScanThreadStateSet& _state_set;
   public:
!   ParNewRefProcTaskExecutor(ParNewGeneration& generation,
                              ParScanThreadStateSet& state_set)
!     : _generation(generation), _state_set(state_set)
    { }
  
    // Executes a task using worker threads.
    virtual void execute(ProcessTask& task);
    virtual void execute(EnqueueTask& task);
--- 285,302 ----
  };
  
  // Implements AbstractRefProcTaskExecutor for ParNew.
  class ParNewRefProcTaskExecutor: public AbstractRefProcTaskExecutor {
   private:
!   ParNewGeneration&      _young_gen;
!   Generation&            _old_gen;
    ParScanThreadStateSet& _state_set;
   public:
!   ParNewRefProcTaskExecutor(ParNewGeneration& young_gen,
!                             Generation& old_gen,
                              ParScanThreadStateSet& state_set)
!     : _young_gen(young_gen), _old_gen(old_gen), _state_set(state_set)
    { }
  
    // Executes a task using worker threads.
    virtual void execute(ProcessTask& task);
    virtual void execute(EnqueueTask& task);
*** 351,361 ****
  
    bool survivor_overflow() { return _survivor_overflow; }
    void set_survivor_overflow(bool v) { _survivor_overflow = v; }
  
   public:
!   ParNewGeneration(ReservedSpace rs, size_t initial_byte_size, int level);
  
    ~ParNewGeneration() {
      for (uint i = 0; i < ParallelGCThreads; i++)
          delete _task_queues->queue(i);
  
--- 352,362 ----
  
    bool survivor_overflow() { return _survivor_overflow; }
    void set_survivor_overflow(bool v) { _survivor_overflow = v; }
  
   public:
!   ParNewGeneration(ReservedSpace rs, size_t initial_byte_size);
  
    ~ParNewGeneration() {
      for (uint i = 0; i < ParallelGCThreads; i++)
          delete _task_queues->queue(i);