src/share/vm/services/memoryService.hpp

*** 51,61 ****
  
  class MemoryService : public AllStatic {
  private:
    enum {
      init_pools_list_size = 10,
!     init_managers_list_size = 5
    };
  
    // index for minor and major generations
    enum {
      minor = 0,
--- 51,62 ----
  
  class MemoryService : public AllStatic {
  private:
    enum {
      init_pools_list_size = 10,
!     init_managers_list_size = 5,
!     init_code_heap_pools_size = 9
    };
  
    // index for minor and major generations
    enum {
      minor = 0,
*** 68,79 ****
  
    // memory managers for minor and major GC statistics
    static GCMemoryManager*               _major_gc_manager;
    static GCMemoryManager*               _minor_gc_manager;
  
!   // Code heap memory pool
!   static MemoryPool*                    _code_heap_pool;
  
    static MemoryPool*                    _metaspace_pool;
    static MemoryPool*                    _compressed_class_pool;
  
    static void add_generation_memory_pool(Generation* gen,
--- 69,81 ----
  
    // memory managers for minor and major GC statistics
    static GCMemoryManager*               _major_gc_manager;
    static GCMemoryManager*               _minor_gc_manager;
  
!   // memory manager and code heap pools for the CodeCache
!   static MemoryManager*                 _code_cache_manager;
!   static GrowableArray<MemoryPool*>*    _code_heap_pools;
  
    static MemoryPool*                    _metaspace_pool;
    static MemoryPool*                    _compressed_class_pool;
  
    static void add_generation_memory_pool(Generation* gen,
*** 121,131 ****
    static void add_parallel_scavenge_heap_info(ParallelScavengeHeap* heap);
    static void add_g1_heap_info(G1CollectedHeap* g1h);
  
  public:
    static void set_universe_heap(CollectedHeap* heap);
!   static void add_code_heap_memory_pool(CodeHeap* heap);
    static void add_metaspace_memory_pools();
  
    static MemoryPool*    get_memory_pool(instanceHandle pool);
    static MemoryManager* get_memory_manager(instanceHandle mgr);
  
--- 123,133 ----
    static void add_parallel_scavenge_heap_info(ParallelScavengeHeap* heap);
    static void add_g1_heap_info(G1CollectedHeap* g1h);
  
  public:
    static void set_universe_heap(CollectedHeap* heap);
!   static void add_code_heap_memory_pool(CodeHeap* heap, const char* name);
    static void add_metaspace_memory_pools();
  
    static MemoryPool*    get_memory_pool(instanceHandle pool);
    static MemoryManager* get_memory_manager(instanceHandle mgr);
  
*** 144,154 ****
      return _managers_list->at(index);
    }
  
    static void track_memory_usage();
    static void track_code_cache_memory_usage() {
!     track_memory_pool_usage(_code_heap_pool);
    }
    static void track_metaspace_memory_usage() {
      track_memory_pool_usage(_metaspace_pool);
    }
    static void track_compressed_class_memory_usage() {
--- 146,159 ----
      return _managers_list->at(index);
    }
  
    static void track_memory_usage();
    static void track_code_cache_memory_usage() {
!     // Track memory pool usage of all CodeCache memory pools
!     for (int i = 0; i < _code_heap_pools->length(); ++i) {
!       track_memory_pool_usage(_code_heap_pools->at(i));
!     }
    }
    static void track_metaspace_memory_usage() {
      track_memory_pool_usage(_metaspace_pool);
    }
    static void track_compressed_class_memory_usage() {