Mercurial > hg > truffle
comparison src/share/vm/services/memoryService.hpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 71963b3f802a |
children | a6414751d537 |
comparison
equal
deleted
inserted
replaced
11197:3479ab380552 | 11198:1e6d5dec4a4e |
---|---|
70 static GCMemoryManager* _major_gc_manager; | 70 static GCMemoryManager* _major_gc_manager; |
71 static GCMemoryManager* _minor_gc_manager; | 71 static GCMemoryManager* _minor_gc_manager; |
72 | 72 |
73 // Code heap memory pool | 73 // Code heap memory pool |
74 static MemoryPool* _code_heap_pool; | 74 static MemoryPool* _code_heap_pool; |
75 | |
76 static MemoryPool* _metaspace_pool; | |
77 static MemoryPool* _compressed_class_pool; | |
75 | 78 |
76 static void add_generation_memory_pool(Generation* gen, | 79 static void add_generation_memory_pool(Generation* gen, |
77 MemoryManager* major_mgr, | 80 MemoryManager* major_mgr, |
78 MemoryManager* minor_mgr); | 81 MemoryManager* minor_mgr); |
79 static void add_generation_memory_pool(Generation* gen, | 82 static void add_generation_memory_pool(Generation* gen, |
119 static void add_g1_heap_info(G1CollectedHeap* g1h); | 122 static void add_g1_heap_info(G1CollectedHeap* g1h); |
120 | 123 |
121 public: | 124 public: |
122 static void set_universe_heap(CollectedHeap* heap); | 125 static void set_universe_heap(CollectedHeap* heap); |
123 static void add_code_heap_memory_pool(CodeHeap* heap); | 126 static void add_code_heap_memory_pool(CodeHeap* heap); |
127 static void add_metaspace_memory_pools(); | |
124 | 128 |
125 static MemoryPool* get_memory_pool(instanceHandle pool); | 129 static MemoryPool* get_memory_pool(instanceHandle pool); |
126 static MemoryManager* get_memory_manager(instanceHandle mgr); | 130 static MemoryManager* get_memory_manager(instanceHandle mgr); |
127 | 131 |
128 static const int num_memory_pools() { | 132 static const int num_memory_pools() { |