Mercurial > hg > graal-compiler
comparison src/share/vm/services/memoryPool.cpp @ 12248:73d0d0218068
8024718: Metaspace performance counters and memory pools should report the same data
Reviewed-by: stefank, dholmes, coleenp
author | ehelin |
---|---|
date | Tue, 17 Sep 2013 20:59:07 +0200 |
parents | 7944aba7ba41 |
children | 190899198332 |
comparison
equal
deleted
inserted
replaced
12247:fac394091d73 | 12248:73d0d0218068 |
---|---|
258 | 258 |
259 return MemoryUsage(initial_size(), used, committed, maxSize); | 259 return MemoryUsage(initial_size(), used, committed, maxSize); |
260 } | 260 } |
261 | 261 |
262 MetaspacePool::MetaspacePool() : | 262 MetaspacePool::MetaspacePool() : |
263 MemoryPool("Metaspace", NonHeap, capacity_in_bytes(), calculate_max_size(), true, false) { } | 263 MemoryPool("Metaspace", NonHeap, 0, calculate_max_size(), true, false) { } |
264 | 264 |
265 MemoryUsage MetaspacePool::get_memory_usage() { | 265 MemoryUsage MetaspacePool::get_memory_usage() { |
266 size_t committed = align_size_down_(capacity_in_bytes(), os::vm_page_size()); | 266 size_t committed = MetaspaceAux::committed_bytes(); |
267 return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size()); | 267 return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size()); |
268 } | 268 } |
269 | 269 |
270 size_t MetaspacePool::used_in_bytes() { | 270 size_t MetaspacePool::used_in_bytes() { |
271 return MetaspaceAux::allocated_used_bytes(); | 271 return MetaspaceAux::allocated_used_bytes(); |
272 } | 272 } |
273 | 273 |
274 size_t MetaspacePool::capacity_in_bytes() const { | |
275 return MetaspaceAux::allocated_capacity_bytes(); | |
276 } | |
277 | |
278 size_t MetaspacePool::calculate_max_size() const { | 274 size_t MetaspacePool::calculate_max_size() const { |
279 return FLAG_IS_CMDLINE(MaxMetaspaceSize) ? MaxMetaspaceSize : max_uintx; | 275 return FLAG_IS_CMDLINE(MaxMetaspaceSize) ? MaxMetaspaceSize : |
276 MemoryUsage::undefined_size(); | |
280 } | 277 } |
281 | 278 |
282 CompressedKlassSpacePool::CompressedKlassSpacePool() : | 279 CompressedKlassSpacePool::CompressedKlassSpacePool() : |
283 MemoryPool("Compressed Class Space", NonHeap, capacity_in_bytes(), CompressedClassSpaceSize, true, false) { } | 280 MemoryPool("Compressed Class Space", NonHeap, 0, CompressedClassSpaceSize, true, false) { } |
284 | 281 |
285 size_t CompressedKlassSpacePool::used_in_bytes() { | 282 size_t CompressedKlassSpacePool::used_in_bytes() { |
286 return MetaspaceAux::allocated_used_bytes(Metaspace::ClassType); | 283 return MetaspaceAux::allocated_used_bytes(Metaspace::ClassType); |
287 } | 284 } |
288 | 285 |
289 size_t CompressedKlassSpacePool::capacity_in_bytes() const { | |
290 return MetaspaceAux::allocated_capacity_bytes(Metaspace::ClassType); | |
291 } | |
292 | |
293 MemoryUsage CompressedKlassSpacePool::get_memory_usage() { | 286 MemoryUsage CompressedKlassSpacePool::get_memory_usage() { |
294 size_t committed = align_size_down_(capacity_in_bytes(), os::vm_page_size()); | 287 size_t committed = MetaspaceAux::committed_bytes(Metaspace::ClassType); |
295 return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size()); | 288 return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size()); |
296 } | 289 } |