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

8066185: VM crashed with SIGSEGV VirtualMemoryTracker::add_reserved_region

Browse Source 
Reviewed-by: coleenp, dholmes
This commit is contained in:
Kumar Srinivasan 2015-02-25 06:21:55 -08:00
parent cdf8c27ddb
commit 8749a5a08c
2 changed files with 209 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdk/src/java.base/share/native/libjli/java.c
View File

@ -651,9 +651,26 @@ static void
SetJvmEnvironment(int argc, char **argv) {
static const char* NMT_Env_Name = "NMT_LEVEL_";
int i;
for (i = 0; i < argc; i++) {
char *arg = argv[i];
/*
* Since this must be a VM flag we stop processing once we see
* an argument the launcher would not have processed beyond (such
* as -version or -h), or an argument that indicates the following
* arguments are for the application (i.e. the main class name, or
* the -jar argument).
*/
if ((i > 0 && *arg != '-')
|| JLI_StrCmp(arg, "-version") == 0
|| JLI_StrCmp(arg, "-fullversion") == 0
|| JLI_StrCmp(arg, "-help") == 0
|| JLI_StrCmp(arg, "-?") == 0
|| JLI_StrCmp(arg, "-jar") == 0
|| JLI_StrCmp(arg, "-X") == 0
) {
return;
}
/*
* The following case checks for "-XX:NativeMemoryTracking=value".
* If value is non null, an environmental variable set to this value
@ -661,7 +678,6 @@ SetJvmEnvironment(int argc, char **argv) {
* The argument is passed to the JVM, which will check validity.
* The JVM is responsible for removing the env variable.
*/
char *arg = argv[i];
if (JLI_StrCCmp(arg, "-XX:NativeMemoryTracking=") == 0) {
int retval;
// get what follows this parameter, include "="

128
jdk/test/tools/launcher/TestSpecialArgs.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, 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
@ -23,12 +23,14 @@
/*
* @test
* @bug 7124089 7131021 8042469
* @summary Checks for MacOSX specific flags are accepted or rejected, and
* MacOSX platforms specific environment is consistent.
* @bug 7124089 7131021 8042469 8066185
* @summary Checks for Launcher special flags, such as MacOSX specific flags,
* and JVM NativeMemoryTracking flags.
* @compile -XDignore.symbol.file TestSpecialArgs.java EnvironmentVariables.java
* @run main TestSpecialArgs
*/
import java.io.File;
import java.io.FileNotFoundException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@ -36,10 +38,14 @@ import java.util.Set;
public class TestSpecialArgs extends TestHelper {
public static void main(String... args) {
public static void main(String... args) throws Exception {
new TestSpecialArgs().run(args);
}
@Test
void testDocking() {
final Map<String, String> envMap = new HashMap<>();
envMap.put("_JAVA_LAUNCHER_DEBUG", "true");
TestResult tr = doExec(envMap, javaCmd, "-XstartOnFirstThread", "-version");
if (isMacOSX) {
if (!tr.contains("In same thread")) {
@ -69,7 +75,45 @@ public class TestSpecialArgs extends TestHelper {
throw new RuntimeException("Error: argument was accepted ????");
}
}
// MacOSX specific tests ensue......
if (!isMacOSX) {
return;
}
Set<String> envToRemove = new HashSet<>();
Map<String, String> map = System.getenv();
for (String s : map.keySet()) {
if (s.startsWith("JAVA_MAIN_CLASS_")
|| s.startsWith("APP_NAME_")
|| s.startsWith("APP_ICON_")) {
envToRemove.add(s);
}
}
runTest(envToRemove, javaCmd, "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
"EnvironmentVariables", "JAVA_MAIN_CLASS_*",
"EnvironmentVariables");
runTest(envToRemove, javaCmd, "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
"-Xdock:name=TestAppName", "EnvironmentVariables",
"APP_NAME_*", "TestAppName");
runTest(envToRemove, javaCmd, "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
"-Xdock:icon=TestAppIcon", "EnvironmentVariables",
"APP_ICON_*", "TestAppIcon");
}
void runTest(Set<String> envToRemove, String... args) {
TestResult tr = doExec(null, envToRemove, args);
if (!tr.isOK()) {
System.err.println(tr.toString());
throw new RuntimeException("Test Fails");
}
}
@Test
void testNativeMemoryTracking() {
final Map<String, String> envMap = new HashMap<>();
envMap.put("_JAVA_LAUNCHER_DEBUG", "true");
TestResult tr;
/*
* test argument : -XX:NativeMemoryTracking=value
* A JVM flag, comsumed by the JVM, but requiring launcher
@ -86,7 +130,6 @@ public class TestSpecialArgs extends TestHelper {
* Code to create env variable not executed.
* 4) give and invalid value and check to make sure JVM commented
*/
{ // NativeMemoryTracking
String launcherPidString = "launcher.pid=";
String envVarPidString = "TRACER_MARKER: NativeMemoryTracking: env var is NMT_LEVEL_";
String NMT_Option_Value = "off";
@ -94,7 +137,6 @@ public class TestSpecialArgs extends TestHelper {
boolean haveLauncherPid = false;
// === Run the tests ===
// ---Test 1a
tr = doExec(envMap, javaCmd, "-XX:NativeMemoryTracking=" + NMT_Option_Value,
"-version");
@ -159,7 +201,6 @@ public class TestSpecialArgs extends TestHelper {
}
}
// --- Test 1b
if (!tr.contains("NativeMemoryTracking: got value " + NMT_Option_Value)) {
System.out.println(tr);
@ -196,37 +237,48 @@ public class TestSpecialArgs extends TestHelper {
System.out.println(tr);
throw new RuntimeException("Error: invalid param did not get JVM Syntax error message");
}
} // NativeMemoryTracking
// MacOSX specific tests ensue......
if (!isMacOSX)
return;
Set<String> envToRemove = new HashSet<>();
Map<String, String> map = System.getenv();
for (String s : map.keySet()) {
if (s.startsWith("JAVA_MAIN_CLASS_")
|| s.startsWith("APP_NAME_")
|| s.startsWith("APP_ICON_")) {
envToRemove.add(s);
}
}
runTest(envToRemove, javaCmd, "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
"EnvironmentVariables", "JAVA_MAIN_CLASS_*",
"EnvironmentVariables");
runTest(envToRemove, javaCmd, "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
"-Xdock:name=TestAppName", "EnvironmentVariables",
"APP_NAME_*", "TestAppName");
runTest(envToRemove, javaCmd, "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
"-Xdock:icon=TestAppIcon", "EnvironmentVariables",
"APP_ICON_*", "TestAppIcon");
}
static void runTest(Set<String> envToRemove, String... args) {
TestResult tr = doExec(null, envToRemove, args);
@Test
void testNMArgumentProcessing() throws FileNotFoundException {
TestResult tr = null;
// the direct invokers of the VM
String options[] = {
"-version", "-fullversion", "-help", "-?", "-X"
};
for (String option : options) {
tr = doExec(javaCmd, option, "-XX:NativeMemoryTracking=summary");
checkTestResult(tr);
}
// create a test jar
File jarFile = new File("test.jar");
createJar(jarFile, "public static void main(String... args){}");
// ones that involve main-class of some sort
tr = doExec(javaCmd, "-jar", jarFile.getName(),
"-XX:NativeMemoryTracking=summary");
checkTestResult(tr);
tr = doExec(javaCmd, "-cp", jarFile.getName(), "Foo",
"-XX:NativeMemoryTracking=summary");
checkTestResult(tr);
final Map<String, String> envMap = new HashMap<>();
// checkwith CLASSPATH set ie. no -cp or -classpath
envMap.put("CLASSPATH", ".");
tr = doExec(envMap, javaCmd, "Foo", "-XX:NativeMemoryTracking=summary");
checkTestResult(tr);
// make sure a missing class is handled correctly, because the class
// resolution is performed by the JVM.
tr = doExec(javaCmd, "AbsentClass", "-XX:NativeMemoryTracking=summary");
if (!tr.contains("Error: Could not find or load main class AbsentClass")) {
throw new RuntimeException("Test Fails");
}
}
void checkTestResult(TestResult tr) {
if (!tr.isOK()) {
System.err.println(tr.toString());
throw new RuntimeException("Test Fails");