mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
Merge
This commit is contained in:
commit
8d6035660e
223 changed files with 5079 additions and 2219 deletions
|
@ -233,7 +233,7 @@ class RecordInstanceClosure : public ObjectClosure {
|
|||
size_t missed_count() { return _missed_count; }
|
||||
};
|
||||
|
||||
void HeapInspection::heap_inspection(outputStream* st) {
|
||||
void HeapInspection::heap_inspection(outputStream* st, bool need_prologue) {
|
||||
ResourceMark rm;
|
||||
HeapWord* ref;
|
||||
|
||||
|
@ -244,7 +244,9 @@ void HeapInspection::heap_inspection(outputStream* st) {
|
|||
case CollectedHeap::GenCollectedHeap: {
|
||||
is_shared_heap = true;
|
||||
SharedHeap* sh = (SharedHeap*)heap;
|
||||
sh->gc_prologue(false /* !full */); // get any necessary locks, etc.
|
||||
if (need_prologue) {
|
||||
sh->gc_prologue(false /* !full */); // get any necessary locks, etc.
|
||||
}
|
||||
ref = sh->perm_gen()->used_region().start();
|
||||
break;
|
||||
}
|
||||
|
@ -290,7 +292,7 @@ void HeapInspection::heap_inspection(outputStream* st) {
|
|||
}
|
||||
st->flush();
|
||||
|
||||
if (is_shared_heap) {
|
||||
if (need_prologue && is_shared_heap) {
|
||||
SharedHeap* sh = (SharedHeap*)heap;
|
||||
sh->gc_epilogue(false /* !full */); // release all acquired locks, etc.
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue