archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8055061: assert at share/vm/services/virtualMemoryTracker.cpp:332 Error: ShouldNotReachHere() when running NMT tests

Browse source 
Handled CDS mapping region and added test for the scenario

Reviewed-by: coleenp, ctornqvi
This commit is contained in:
Zhengyu Gu 2014-08-19 09:05:55 -04:00
parent 2d98294837
commit 7bce315059
2 changed files with 66 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/services/virtualMemoryTracker.cpp
View file

@ -337,13 +337,21 @@ bool VirtualMemoryTracker::add_reserved_region(address base_addr, size_t size,
*reserved_rgn = rgn; *reserved_rgn = rgn;
return true; return true;
} else { }
// CDS mapping region.
// CDS reserves the whole region for mapping CDS archive, then maps each section into the region.
// NMT reports CDS as a whole.
if (reserved_rgn->flag() == mtClassShared) {
assert(reserved_rgn->contain_region(base_addr, size), "Reserved CDS region should contain this mapping region");
return true;
}
ShouldNotReachHere(); ShouldNotReachHere();
return false; return false;
} }
} }
} }
}
void VirtualMemoryTracker::set_reserved_region_type(address addr, MEMFLAGS flag) { void VirtualMemoryTracker::set_reserved_region_type(address addr, MEMFLAGS flag) {
assert(addr != NULL, "Invalid address"); assert(addr != NULL, "Invalid address");

55
hotspot/test/runtime/NMT/NMTWithCDS.java Normal file
View file

@ -0,0 +1,55 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8055061
* @key nmt
* @library /testlibrary
* @run main NMTWithCDS
*/
import com.oracle.java.testlibrary.*;
public class NMTWithCDS {
public static void main(String[] args) throws Exception {
ProcessBuilder pb;
pb = ProcessTools.createJavaProcessBuilder("-XX:SharedArchiveFile=./sample.jsa", "-Xshare:dump");
OutputAnalyzer output = new OutputAnalyzer(pb.start());
try {
output.shouldContain("Loading classes to share");
output.shouldHaveExitValue(0);
pb = ProcessTools.createJavaProcessBuilder(
"-XX:NativeMemoryTracking=detail", "-XX:SharedArchiveFile=./sample.jsa", "-Xshare:on", "-version");
output = new OutputAnalyzer(pb.start());
output.shouldContain("sharing");
output.shouldHaveExitValue(0);
} catch (RuntimeException e) {
// Report 'passed' if CDS was turned off.
output.shouldContain("Unable to use shared archive");
output.shouldHaveExitValue(1);
}
}
}