infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-24 09:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Coleen Phillimore 2012-11-20 20:27:40 -05:00
commit 274b3df2dc
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hotspot/src/share/vm/services/memSnapshot.cpp
View File

@ -261,17 +261,19 @@ bool VMMemPointerIterator::remove_released_region(MemPointerRecord* rec) {
VMMemRegion* cur = (VMMemRegion*)current();
assert(cur->is_reserved_region() && cur->contains_region(rec),
"Sanity check");
#ifdef ASSERT
VMMemRegion* next_reg = (VMMemRegion*)peek_next();
// should not have any committed memory in this reserved region
assert(next_reg == NULL || !next_reg->is_committed_region(), "Sanity check");
#endif
if (rec->is_same_region(cur)) {
// release whole reserved region
#ifdef ASSERT
VMMemRegion* next_region = (VMMemRegion*)peek_next();
// should not have any committed memory in this reserved region
assert(next_region == NULL || !next_region->is_committed_region(), "Sanity check");
#endif
remove();
} else if (rec->addr() == cur->addr() ||
rec->addr() + rec->size() == cur->addr() + cur->size()) {
// released region is at either end of this region
cur->exclude_region(rec->addr(), rec->size());
assert(check_reserved_region(), "Integrity check");
} else { // split the reserved region and release the middle
address high_addr = cur->addr() + cur->size();
size_t sz = high_addr - rec->addr();
@ -280,10 +282,14 @@ bool VMMemPointerIterator::remove_released_region(MemPointerRecord* rec) {
if (MemTracker::track_callsite()) {
MemPointerRecordEx tmp(rec->addr() + rec->size(), cur->flags(), sz,
((VMMemRegionEx*)cur)->pc());
return insert_reserved_region(&tmp);
bool ret = insert_reserved_region(&tmp);
assert(!ret || check_reserved_region(), "Integrity check");
return ret;
} else {
MemPointerRecord tmp(rec->addr() + rec->size(), cur->flags(), sz);
return insert_reserved_region(&tmp);
bool ret = insert_reserved_region(&tmp);
assert(!ret || check_reserved_region(), "Integrity check");
return ret;
}
}
return true;

17
hotspot/src/share/vm/services/memSnapshot.hpp
View File

@ -146,6 +146,23 @@ class VMMemPointerIterator : public MemPointerIterator {
// reset current position
inline void reset() { _pos = 0; }
#ifdef ASSERT
// check integrity of records on current reserved memory region.
bool check_reserved_region() {
VMMemRegion* reserved_region = (VMMemRegion*)current();
assert(reserved_region != NULL && reserved_region->is_reserved_region(),
"Sanity check");
// all committed regions that follow current reserved region, should all
// belong to the reserved region.
VMMemRegion* next_region = (VMMemRegion*)next();
for (; next_region != NULL && next_region->is_committed_region();
next_region = (VMMemRegion*)next() ) {
if(!reserved_region->contains_region(next_region)) {
return false;
}
}
return true;
}
virtual bool is_dup_pointer(const MemPointer* ptr1,
const MemPointer* ptr2) const {
VMMemRegion* p1 = (VMMemRegion*)ptr1;