src/share/vm/gc/shared/genCollectedHeap.hpp

*** 28,39 ****
  #include "gc/shared/adaptiveSizePolicy.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/generation.hpp"
  
- class SubTasksDone;
  class FlexibleWorkGang;
  
  // A "GenCollectedHeap" is a CollectedHeap that uses generational
  // collection.  It has two generations, young and old.
  class GenCollectedHeap : public CollectedHeap {
    friend class GenCollectorPolicy;
--- 28,40 ----
  #include "gc/shared/adaptiveSizePolicy.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/generation.hpp"
  
  class FlexibleWorkGang;
+ class StrongRootsScope;
+ class SubTasksDone;
  
  // A "GenCollectedHeap" is a CollectedHeap that uses generational
  // collection.  It has two generations, young and old.
  class GenCollectedHeap : public CollectedHeap {
    friend class GenCollectorPolicy;
*** 361,373 ****
  
    // Convenience function to be used in situations where the heap type can be
    // asserted to be this type.
    static GenCollectedHeap* heap();
  
-   void set_par_threads(uint t);
-   void set_n_termination(uint t);
- 
    // Invoke the "do_oop" method of one of the closures "not_older_gens"
    // or "older_gens" on root locations for the generation at
    // "level".  (The "older_gens" closure is used for scanning references
    // from older generations; "not_older_gens" is used everywhere else.)
    // If "younger_gens_as_roots" is false, younger generations are
--- 362,371 ----
*** 383,418 ****
      SO_AllCodeCache        =  0x8,
      SO_ScavengeCodeCache   = 0x10
    };
  
   private:
!   void process_roots(bool activate_scope,
                       ScanningOption so,
                       OopClosure* strong_roots,
                       OopClosure* weak_roots,
                       CLDClosure* strong_cld_closure,
                       CLDClosure* weak_cld_closure,
                       CodeBlobClosure* code_roots);
  
-   void gen_process_roots(int level,
-                          bool younger_gens_as_roots,
-                          bool activate_scope,
-                          ScanningOption so,
-                          OopsInGenClosure* not_older_gens,
-                          OopsInGenClosure* weak_roots,
-                          OopsInGenClosure* older_gens,
-                          CLDClosure* cld_closure,
-                          CLDClosure* weak_cld_closure,
-                          CodeBlobClosure* code_closure);
- 
   public:
    static const bool StrongAndWeakRoots = false;
    static const bool StrongRootsOnly    = true;
  
!   void gen_process_roots(int level,
                           bool younger_gens_as_roots,
-                          bool activate_scope,
                           ScanningOption so,
                           bool only_strong_roots,
                           OopsInGenClosure* not_older_gens,
                           OopsInGenClosure* older_gens,
                           CLDClosure* cld_closure);
--- 381,405 ----
      SO_AllCodeCache        =  0x8,
      SO_ScavengeCodeCache   = 0x10
    };
  
   private:
!   void process_roots(StrongRootsScope* scope,
                       ScanningOption so,
                       OopClosure* strong_roots,
                       OopClosure* weak_roots,
                       CLDClosure* strong_cld_closure,
                       CLDClosure* weak_cld_closure,
                       CodeBlobClosure* code_roots);
  
   public:
    static const bool StrongAndWeakRoots = false;
    static const bool StrongRootsOnly    = true;
  
!   void gen_process_roots(StrongRootsScope* scope,
!                          int level,
                           bool younger_gens_as_roots,
                           ScanningOption so,
                           bool only_strong_roots,
                           OopsInGenClosure* not_older_gens,
                           OopsInGenClosure* older_gens,
                           CLDClosure* cld_closure);