Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_interface/collectedHeap.cpp @ 12372:2dfccd93510a
Merge
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Fri, 11 Oct 2013 21:41:42 +0200 |
parents | c4af81d4fcc3 d6c266999345 |
children | 819c0394c6e3 |
comparison
equal
deleted
inserted
replaced
12371:e32f2b195867 | 12372:2dfccd93510a |
---|---|
85 | 85 |
86 MetaspaceSummary CollectedHeap::create_metaspace_summary() { | 86 MetaspaceSummary CollectedHeap::create_metaspace_summary() { |
87 const MetaspaceSizes meta_space( | 87 const MetaspaceSizes meta_space( |
88 MetaspaceAux::allocated_capacity_bytes(), | 88 MetaspaceAux::allocated_capacity_bytes(), |
89 MetaspaceAux::allocated_used_bytes(), | 89 MetaspaceAux::allocated_used_bytes(), |
90 MetaspaceAux::reserved_in_bytes()); | 90 MetaspaceAux::reserved_bytes()); |
91 const MetaspaceSizes data_space( | 91 const MetaspaceSizes data_space( |
92 MetaspaceAux::allocated_capacity_bytes(Metaspace::NonClassType), | 92 MetaspaceAux::allocated_capacity_bytes(Metaspace::NonClassType), |
93 MetaspaceAux::allocated_used_bytes(Metaspace::NonClassType), | 93 MetaspaceAux::allocated_used_bytes(Metaspace::NonClassType), |
94 MetaspaceAux::reserved_in_bytes(Metaspace::NonClassType)); | 94 MetaspaceAux::reserved_bytes(Metaspace::NonClassType)); |
95 const MetaspaceSizes class_space( | 95 const MetaspaceSizes class_space( |
96 MetaspaceAux::allocated_capacity_bytes(Metaspace::ClassType), | 96 MetaspaceAux::allocated_capacity_bytes(Metaspace::ClassType), |
97 MetaspaceAux::allocated_used_bytes(Metaspace::ClassType), | 97 MetaspaceAux::allocated_used_bytes(Metaspace::ClassType), |
98 MetaspaceAux::reserved_in_bytes(Metaspace::ClassType)); | 98 MetaspaceAux::reserved_bytes(Metaspace::ClassType)); |
99 | 99 |
100 return MetaspaceSummary(meta_space, data_space, class_space); | 100 return MetaspaceSummary(meta_space, data_space, class_space); |
101 } | 101 } |
102 | 102 |
103 void CollectedHeap::print_heap_before_gc() { | 103 void CollectedHeap::print_heap_before_gc() { |
114 Universe::print_heap_after_gc(); | 114 Universe::print_heap_after_gc(); |
115 } | 115 } |
116 if (_gc_heap_log != NULL) { | 116 if (_gc_heap_log != NULL) { |
117 _gc_heap_log->log_heap_after(); | 117 _gc_heap_log->log_heap_after(); |
118 } | 118 } |
119 } | |
120 | |
121 void CollectedHeap::register_nmethod(nmethod* nm) { | |
122 assert_locked_or_safepoint(CodeCache_lock); | |
123 } | |
124 | |
125 void CollectedHeap::unregister_nmethod(nmethod* nm) { | |
126 assert_locked_or_safepoint(CodeCache_lock); | |
119 } | 127 } |
120 | 128 |
121 void CollectedHeap::trace_heap(GCWhen::Type when, GCTracer* gc_tracer) { | 129 void CollectedHeap::trace_heap(GCWhen::Type when, GCTracer* gc_tracer) { |
122 const GCHeapSummary& heap_summary = create_heap_summary(); | 130 const GCHeapSummary& heap_summary = create_heap_summary(); |
123 const MetaspaceSummary& metaspace_summary = create_metaspace_summary(); | 131 const MetaspaceSummary& metaspace_summary = create_metaspace_summary(); |