src/share/vm/services/memoryManager.hpp

rev 11778 : [mq]: service.patch

*** 23,34 ****
--- 23,37 ----
   */
  
  #ifndef SHARE_VM_SERVICES_MEMORYMANAGER_HPP
  #define SHARE_VM_SERVICES_MEMORYMANAGER_HPP
  
+ #include "gc/shared/gcCause.hpp"
  #include "memory/allocation.hpp"
+ #include "runtime/handles.hpp"
  #include "runtime/timer.hpp"
+ #include "oops/instanceOop.hpp"
  #include "services/memoryUsage.hpp"
  
  // A memory manager is responsible for managing one or more memory pools.
  // The garbage collector is one type of memory managers responsible
  // for reclaiming memory occupied by unreachable objects.  A Java virtual
*** 73,90 ****
    void oops_do(OopClosure* f);
  
    // Static factory methods to get a memory manager of a specific type
    static MemoryManager*   get_code_cache_memory_manager();
    static MemoryManager*   get_metaspace_memory_manager();
-   static GCMemoryManager* get_copy_memory_manager();
-   static GCMemoryManager* get_msc_memory_manager();
-   static GCMemoryManager* get_parnew_memory_manager();
-   static GCMemoryManager* get_cms_memory_manager();
-   static GCMemoryManager* get_psScavenge_memory_manager();
-   static GCMemoryManager* get_psMarkSweep_memory_manager();
-   static GCMemoryManager* get_g1YoungGen_memory_manager();
-   static GCMemoryManager* get_g1OldGen_memory_manager();
  };
  
  class CodeCacheMemoryManager : public MemoryManager {
  private:
  public:
--- 76,85 ----
*** 184,256 ****
  
    void set_notification_enabled(bool enabled) { _notification_enabled = enabled; }
    bool is_notification_enabled() { return _notification_enabled; }
  };
  
- // These subclasses of GCMemoryManager are defined to include
- // GC-specific information.
- // TODO: Add GC-specific information
- class CopyMemoryManager : public GCMemoryManager {
- private:
- public:
-   CopyMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "Copy"; }
- };
- 
- class MSCMemoryManager : public GCMemoryManager {
- private:
- public:
-   MSCMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "MarkSweepCompact"; }
- };
- 
- class ParNewMemoryManager : public GCMemoryManager {
- private:
- public:
-   ParNewMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "ParNew"; }
- };
- 
- class CMSMemoryManager : public GCMemoryManager {
- private:
- public:
-   CMSMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "ConcurrentMarkSweep";}
- };
- 
- class PSScavengeMemoryManager : public GCMemoryManager {
- private:
- public:
-   PSScavengeMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "PS Scavenge"; }
- };
- 
- class PSMarkSweepMemoryManager : public GCMemoryManager {
- private:
- public:
-   PSMarkSweepMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "PS MarkSweep"; }
- };
- 
- class G1YoungGenMemoryManager : public GCMemoryManager {
- private:
- public:
-   G1YoungGenMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "G1 Young Generation"; }
- };
- 
- class G1OldGenMemoryManager : public GCMemoryManager {
- private:
- public:
-   G1OldGenMemoryManager() : GCMemoryManager() {}
- 
-   const char* name() { return "G1 Old Generation"; }
- };
- 
  #endif // SHARE_VM_SERVICES_MEMORYMANAGER_HPP
--- 179,184 ----