stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8327169: serviceability/dcmd/vm/SystemMapTest.java and SystemDumpMapTest.java may fail after JDK-8326586

Browse Source 
Reviewed-by: jsjolen, mbaesken
This commit is contained in:
Thomas Stuefe 2024-03-21 12:13:10 +00:00
parent 700679011e
commit c434b79cff
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotspot/share/nmt/memMapPrinter.cpp
View File

@ -89,8 +89,11 @@ class CachedNMTInformation : public VirtualMemoryWalker {
Range* _ranges; Range* _ranges;
MEMFLAGS* _flags; MEMFLAGS* _flags;
size_t _count, _capacity; size_t _count, _capacity;
mutable size_t _last;
public: public:
CachedNMTInformation() : _ranges(nullptr), _flags(nullptr), _count(0), _capacity(0) {} CachedNMTInformation() : _ranges(nullptr), _flags(nullptr),
_count(0), _capacity(0), _last(0) {}
~CachedNMTInformation() { ~CachedNMTInformation() {
ALLOW_C_FUNCTION(free, ::free(_ranges);) ALLOW_C_FUNCTION(free, ::free(_ranges);)
@ -131,17 +134,16 @@ public:
// We optimize for sequential lookups. Since this class is used when a list // We optimize for sequential lookups. Since this class is used when a list
// of OS mappings is scanned (VirtualQuery, /proc/pid/maps), and these lists // of OS mappings is scanned (VirtualQuery, /proc/pid/maps), and these lists
// are usually sorted in order of addresses, ascending. // are usually sorted in order of addresses, ascending.
static uintx last = 0; if (to <= _ranges[_last].from) {
if (to <= _ranges[last].from) {
// the range is to the right of the given section, we need to re-start the search // the range is to the right of the given section, we need to re-start the search
last = 0; _last = 0;
} }
MemFlagBitmap bm; MemFlagBitmap bm;
for(uintx i = last; i < _count; i++) { for(uintx i = _last; i < _count; i++) {
if (range_intersects(from, to, _ranges[i].from, _ranges[i].to)) { if (range_intersects(from, to, _ranges[i].from, _ranges[i].to)) {
bm.set_flag(_flags[i]); bm.set_flag(_flags[i]);
} else if (to <= _ranges[i].from) { } else if (to <= _ranges[i].from) {
last = i; _last = i;
break; break;
} }
} }