comparison src/share/vm/memory/metaspaceCounters.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 270d7cb38f40
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
64 }; 64 };
65 65
66 MetaspacePerfCounters* MetaspaceCounters::_perf_counters = NULL; 66 MetaspacePerfCounters* MetaspaceCounters::_perf_counters = NULL;
67 67
68 size_t MetaspaceCounters::used() { 68 size_t MetaspaceCounters::used() {
69 return MetaspaceAux::allocated_used_bytes(); 69 return MetaspaceAux::used_bytes();
70 } 70 }
71 71
72 size_t MetaspaceCounters::capacity() { 72 size_t MetaspaceCounters::capacity() {
73 return MetaspaceAux::committed_bytes(); 73 return MetaspaceAux::committed_bytes();
74 } 74 }
96 } 96 }
97 97
98 MetaspacePerfCounters* CompressedClassSpaceCounters::_perf_counters = NULL; 98 MetaspacePerfCounters* CompressedClassSpaceCounters::_perf_counters = NULL;
99 99
100 size_t CompressedClassSpaceCounters::used() { 100 size_t CompressedClassSpaceCounters::used() {
101 return MetaspaceAux::allocated_used_bytes(Metaspace::ClassType); 101 return MetaspaceAux::used_bytes(Metaspace::ClassType);
102 } 102 }
103 103
104 size_t CompressedClassSpaceCounters::capacity() { 104 size_t CompressedClassSpaceCounters::capacity() {
105 return MetaspaceAux::committed_bytes(Metaspace::ClassType); 105 return MetaspaceAux::committed_bytes(Metaspace::ClassType);
106 } 106 }