archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8181757: NonNMethod heap in segmented CodeCache is not scanned in some cases

Browse source 
8171365: nsk/jvmti/scenarios/events/EM04/em04t001: many errors for missed events

Reviewed-by: thartmann, kvn
This commit is contained in:
Dean Long 2017-06-13 10:27:42 -07:00
parent 7311151cd6
commit a1ea428918
2 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hotspot/src/share/vm/code/codeCache.cpp
View file

@ -130,6 +130,7 @@ class CodeBlob_sizes {
// Iterate over all CodeHeaps // Iterate over all CodeHeaps
#define FOR_ALL_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _heaps->begin(); heap != _heaps->end(); ++heap) #define FOR_ALL_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _heaps->begin(); heap != _heaps->end(); ++heap)
#define FOR_ALL_NMETHOD_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _nmethod_heaps->begin(); heap != _nmethod_heaps->end(); ++heap) #define FOR_ALL_NMETHOD_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _nmethod_heaps->begin(); heap != _nmethod_heaps->end(); ++heap)
#define FOR_ALL_ALLOCABLE_HEAPS(heap) for (GrowableArrayIterator<CodeHeap*> heap = _allocable_heaps->begin(); heap != _allocable_heaps->end(); ++heap)
// Iterate over all CodeBlobs (cb) on the given CodeHeap // Iterate over all CodeBlobs (cb) on the given CodeHeap
#define FOR_ALL_BLOBS(cb, heap) for (CodeBlob* cb = first_blob(heap); cb != NULL; cb = next_blob(heap, cb)) #define FOR_ALL_BLOBS(cb, heap) for (CodeBlob* cb = first_blob(heap); cb != NULL; cb = next_blob(heap, cb))
@ -140,10 +141,11 @@ int CodeCache::_number_of_nmethods_with_dependencies = 0;
bool CodeCache::_needs_cache_clean = false; bool CodeCache::_needs_cache_clean = false;
nmethod* CodeCache::_scavenge_root_nmethods = NULL; nmethod* CodeCache::_scavenge_root_nmethods = NULL;
// Initialize array of CodeHeaps // Initialize arrays of CodeHeap subsets
GrowableArray<CodeHeap*>* CodeCache::_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true); GrowableArray<CodeHeap*>* CodeCache::_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
GrowableArray<CodeHeap*>* CodeCache::_compiled_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true); GrowableArray<CodeHeap*>* CodeCache::_compiled_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
GrowableArray<CodeHeap*>* CodeCache::_nmethod_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true); GrowableArray<CodeHeap*>* CodeCache::_nmethod_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
GrowableArray<CodeHeap*>* CodeCache::_allocable_heaps = new(ResourceObj::C_HEAP, mtCode) GrowableArray<CodeHeap*> (CodeBlobType::All, true);
void CodeCache::check_heap_sizes(size_t non_nmethod_size, size_t profiled_size, size_t non_profiled_size, size_t cache_size, bool all_set) { void CodeCache::check_heap_sizes(size_t non_nmethod_size, size_t profiled_size, size_t non_profiled_size, size_t cache_size, bool all_set) {
size_t total_size = non_nmethod_size + profiled_size + non_profiled_size; size_t total_size = non_nmethod_size + profiled_size + non_profiled_size;
@ -338,6 +340,7 @@ ReservedCodeSpace CodeCache::reserve_heap_memory(size_t size) {
return rs; return rs;
} }
// Heaps available for allocation
bool CodeCache::heap_available(int code_blob_type) { bool CodeCache::heap_available(int code_blob_type) {
if (!SegmentedCodeCache) { if (!SegmentedCodeCache) {
// No segmentation: use a single code heap // No segmentation: use a single code heap
@ -391,6 +394,9 @@ void CodeCache::add_heap(CodeHeap* heap) {
if (code_blob_type_accepts_nmethod(type)) { if (code_blob_type_accepts_nmethod(type)) {
_nmethod_heaps->insert_sorted<code_heap_compare>(heap); _nmethod_heaps->insert_sorted<code_heap_compare>(heap);
} }
if (code_blob_type_accepts_allocable(type)) {
_allocable_heaps->insert_sorted<code_heap_compare>(heap);
}
} }
void CodeCache::add_heap(ReservedSpace rs, const char* name, int code_blob_type) { void CodeCache::add_heap(ReservedSpace rs, const char* name, int code_blob_type) {
@ -620,7 +626,7 @@ nmethod* CodeCache::find_nmethod(void* start) {
void CodeCache::blobs_do(void f(CodeBlob* nm)) { void CodeCache::blobs_do(void f(CodeBlob* nm)) {
assert_locked_or_safepoint(CodeCache_lock); assert_locked_or_safepoint(CodeCache_lock);
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_HEAPS(heap) {
FOR_ALL_BLOBS(cb, *heap) { FOR_ALL_BLOBS(cb, *heap) {
f(cb); f(cb);
} }
@ -663,7 +669,7 @@ void CodeCache::do_unloading(BoolObjectClosure* is_alive, bool unloading_occurre
void CodeCache::blobs_do(CodeBlobClosure* f) { void CodeCache::blobs_do(CodeBlobClosure* f) {
assert_locked_or_safepoint(CodeCache_lock); assert_locked_or_safepoint(CodeCache_lock);
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
FOR_ALL_BLOBS(cb, *heap) { FOR_ALL_BLOBS(cb, *heap) {
if (cb->is_alive()) { if (cb->is_alive()) {
f->do_code_blob(cb); f->do_code_blob(cb);
@ -960,7 +966,7 @@ address CodeCache::high_bound(int code_blob_type) {
size_t CodeCache::capacity() { size_t CodeCache::capacity() {
size_t cap = 0; size_t cap = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
cap += (*heap)->capacity(); cap += (*heap)->capacity();
} }
return cap; return cap;
@ -973,7 +979,7 @@ size_t CodeCache::unallocated_capacity(int code_blob_type) {
size_t CodeCache::unallocated_capacity() { size_t CodeCache::unallocated_capacity() {
size_t unallocated_cap = 0; size_t unallocated_cap = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
unallocated_cap += (*heap)->unallocated_capacity(); unallocated_cap += (*heap)->unallocated_capacity();
} }
return unallocated_cap; return unallocated_cap;
@ -981,7 +987,7 @@ size_t CodeCache::unallocated_capacity() {
size_t CodeCache::max_capacity() { size_t CodeCache::max_capacity() {
size_t max_cap = 0; size_t max_cap = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
max_cap += (*heap)->max_capacity(); max_cap += (*heap)->max_capacity();
} }
return max_cap; return max_cap;
@ -1007,7 +1013,7 @@ double CodeCache::reverse_free_ratio(int code_blob_type) {
size_t CodeCache::bytes_allocated_in_freelists() { size_t CodeCache::bytes_allocated_in_freelists() {
size_t allocated_bytes = 0; size_t allocated_bytes = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
allocated_bytes += (*heap)->allocated_in_freelist(); allocated_bytes += (*heap)->allocated_in_freelist();
} }
return allocated_bytes; return allocated_bytes;
@ -1015,7 +1021,7 @@ size_t CodeCache::bytes_allocated_in_freelists() {
int CodeCache::allocated_segments() { int CodeCache::allocated_segments() {
int number_of_segments = 0; int number_of_segments = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
number_of_segments += (*heap)->allocated_segments(); number_of_segments += (*heap)->allocated_segments();
} }
return number_of_segments; return number_of_segments;
@ -1023,7 +1029,7 @@ int CodeCache::allocated_segments() {
size_t CodeCache::freelists_length() { size_t CodeCache::freelists_length() {
size_t length = 0; size_t length = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
length += (*heap)->freelist_length(); length += (*heap)->freelist_length();
} }
return length; return length;
@ -1354,7 +1360,7 @@ void CodeCache::report_codemem_full(int code_blob_type, bool print) {
void CodeCache::print_memory_overhead() { void CodeCache::print_memory_overhead() {
size_t wasted_bytes = 0; size_t wasted_bytes = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
CodeHeap* curr_heap = *heap; CodeHeap* curr_heap = *heap;
for (CodeBlob* cb = (CodeBlob*)curr_heap->first(); cb != NULL; cb = (CodeBlob*)curr_heap->next(cb)) { for (CodeBlob* cb = (CodeBlob*)curr_heap->first(); cb != NULL; cb = (CodeBlob*)curr_heap->next(cb)) {
HeapBlock* heap_block = ((HeapBlock*)cb) - 1; HeapBlock* heap_block = ((HeapBlock*)cb) - 1;
@ -1400,7 +1406,7 @@ void CodeCache::print_internals() {
ResourceMark rm; ResourceMark rm;
int i = 0; int i = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
if ((_nmethod_heaps->length() >= 1) && Verbose) { if ((_nmethod_heaps->length() >= 1) && Verbose) {
tty->print_cr("-- %s --", (*heap)->name()); tty->print_cr("-- %s --", (*heap)->name());
} }
@ -1497,7 +1503,7 @@ void CodeCache::print() {
CodeBlob_sizes live; CodeBlob_sizes live;
CodeBlob_sizes dead; CodeBlob_sizes dead;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
FOR_ALL_BLOBS(cb, *heap) { FOR_ALL_BLOBS(cb, *heap) {
if (!cb->is_alive()) { if (!cb->is_alive()) {
dead.add(cb); dead.add(cb);
@ -1523,7 +1529,7 @@ void CodeCache::print() {
int number_of_blobs = 0; int number_of_blobs = 0;
int number_of_oop_maps = 0; int number_of_oop_maps = 0;
int map_size = 0; int map_size = 0;
FOR_ALL_NMETHOD_HEAPS(heap) { FOR_ALL_ALLOCABLE_HEAPS(heap) {
FOR_ALL_BLOBS(cb, *heap) { FOR_ALL_BLOBS(cb, *heap) {
if (cb->is_alive()) { if (cb->is_alive()) {
number_of_blobs++; number_of_blobs++;

6
hotspot/src/share/vm/code/codeCache.hpp
View file

@ -85,6 +85,7 @@ class CodeCache : AllStatic {
static GrowableArray<CodeHeap*>* _heaps; static GrowableArray<CodeHeap*>* _heaps;
static GrowableArray<CodeHeap*>* _compiled_heaps; static GrowableArray<CodeHeap*>* _compiled_heaps;
static GrowableArray<CodeHeap*>* _nmethod_heaps; static GrowableArray<CodeHeap*>* _nmethod_heaps;
static GrowableArray<CodeHeap*>* _allocable_heaps;
static address _low_bound; // Lower bound of CodeHeap addresses static address _low_bound; // Lower bound of CodeHeap addresses
static address _high_bound; // Upper bound of CodeHeap addresses static address _high_bound; // Upper bound of CodeHeap addresses
@ -237,6 +238,11 @@ class CodeCache : AllStatic {
return type == CodeBlobType::All || type <= CodeBlobType::MethodProfiled; return type == CodeBlobType::All || type <= CodeBlobType::MethodProfiled;
} }
static bool code_blob_type_accepts_allocable(int type) {
return type <= CodeBlobType::All;
}
// Returns the CodeBlobType for the given compilation level // Returns the CodeBlobType for the given compilation level
static int get_code_blob_type(int comp_level) { static int get_code_blob_type(int comp_level) {
if (comp_level == CompLevel_none || if (comp_level == CompLevel_none ||