--- a/jdk/make/src/classes/build/tools/module/boot.modules Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/make/src/classes/build/tools/module/boot.modules Mon Oct 19 12:30:18 2015 -0700
@@ -29,3 +29,4 @@
jdk.security.auth
jdk.security.jgss
jdk.snmp
+jdk.vm.ci
--- a/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/src/java.base/share/classes/jdk/internal/HotSpotIntrinsicCandidate.java Mon Oct 19 12:30:18 2015 -0700
@@ -28,8 +28,8 @@
import java.lang.annotation.*;
/**
- * The {@code @HotSpotIntrinsicCandidate} annotation is specific to the Oracle Java
- * HotSpot Virtual Machine implementation and indicates that an annotated method
+ * The {@code @HotSpotIntrinsicCandidate} annotation is specific to the
+ * HotSpot Virtual Machine. It indicates that an annotated method
* may be (but is not guaranteed to be) intrinsified by the HotSpot VM. A method
* is intrinsified if the HotSpot VM replaces the annotated method with hand-written
* assembly and/or hand-written compiler IR -- a compiler intrinsic -- to improve
--- a/jdk/src/java.management/share/classes/sun/management/Agent.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/Agent.java Mon Oct 19 12:30:18 2015 -0700
@@ -102,7 +102,10 @@
private void addConfigProperties() {
appendConfigPropsHeader();
boolean[] first = new boolean[] {true};
- configProps.entrySet().stream().forEach((e) -> {
+ Properties props = configProps != null ?
+ configProps : getManagementProperties();
+
+ props.entrySet().stream().forEach((e) -> {
String key = (String)e.getKey();
if (key.startsWith("com.sun.management.")) {
addConfigProp(key, e.getValue(), first[0]);
--- a/jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java Mon Oct 19 12:30:18 2015 -0700
@@ -27,6 +27,7 @@
/**
*/
+@Deprecated
public class CompilerThreadStat implements java.io.Serializable {
private String name;
private long taskCount;
--- a/jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java Mon Oct 19 12:30:18 2015 -0700
@@ -90,6 +90,7 @@
this.time = (LongCounter) lookup(basename + "time");
}
+ @SuppressWarnings("deprecation")
CompilerThreadStat getCompilerThreadStat() {
MethodInfo minfo = new MethodInfo(method.stringValue(),
(int) type.longValue(),
@@ -182,6 +183,7 @@
return nmethodSize.longValue();
}
+ @Deprecated
public List<CompilerThreadStat> getCompilerThreadStats() {
List<CompilerThreadStat> list = new ArrayList<>(threads.size());
for (CompilerThreadInfo info : threads) {
--- a/jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java Mon Oct 19 12:30:18 2015 -0700
@@ -46,6 +46,7 @@
* the statistic of a compiler thread.
*
*/
+ @Deprecated
public java.util.List<CompilerThreadStat> getCompilerThreadStats();
/**
--- a/jdk/test/ProblemList.txt Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/test/ProblemList.txt Mon Oct 19 12:30:18 2015 -0700
@@ -386,7 +386,4 @@
# 8057732
sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java generic-all
-# 8132648
-sun/tools/jhsdb/BasicLauncherTest.java generic-all
-
############################################################################
--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java Mon Oct 19 12:30:18 2015 -0700
@@ -255,8 +255,7 @@
// and set the executable flag
Path localLauncherPath = FS.getPath(WORK_DIR, "launcher");
Files.copy(launcherPath, localLauncherPath,
- StandardCopyOption.REPLACE_EXISTING,
- StandardCopyOption.COPY_ATTRIBUTES);
+ StandardCopyOption.REPLACE_EXISTING);
if (!Files.isExecutable(localLauncherPath)) {
Set<PosixFilePermission> perms = new HashSet<>(
Files.getPosixFilePermissions(
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatus1Test.java Mon Oct 19 12:30:18 2015 -0700
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * A flavor of {@linkplain JMXStatusTest} test where the test application
+ * is started without the management agent initialized.
+ */
+public class JMXStatus1Test extends JMXStatusTest {
+ @Override
+ protected List<String> getCustomVmArgs() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ protected Pattern getDefaultPattern() {
+ return JMXStatusTest.DISABLED_AGENT_STATUS;
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatus2Test.java Mon Oct 19 12:30:18 2015 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * A flavor of {@linkplain JMXStatusTest} test where the test application
+ * is started with the management agent initialized.
+ */
+public class JMXStatus2Test extends JMXStatusTest {
+ @Override
+ protected List<String> getCustomVmArgs() {
+ // not specifying the jmxremote.port > only local agent started
+ return Arrays.asList(
+ "-Dcom.sun.management.jmxremote"
+ );
+ }
+
+ @Override
+ protected Pattern getDefaultPattern() {
+ return JMXStatusTest.LOCAL_AGENT_STATUS;
+ }
+}
\ No newline at end of file
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java Mon Oct 19 11:28:50 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java Mon Oct 19 12:30:18 2015 -0700
@@ -22,6 +22,8 @@
*/
import java.net.BindException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import org.testng.annotations.*;
@@ -31,23 +33,25 @@
/**
* @test
- * @bug 8023093
+ * @bug 8023093 8138748
* @summary Performs a sanity test for the ManagementAgent.status diagnostic command.
- * Management agent may be disable, started (only local connections) and started.
+ * Management agent may be disabled, started (only local connections) and started.
* The test asserts that the expected text is being printed.
* @library /lib/testlibrary
* @modules java.management/sun.management
* @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
- * @run testng/othervm -XX:+UsePerfData JMXStatusTest
+ * JMXStatusTest JMXStatus1Test JMXStatus2Test
+ * @run testng/othervm -XX:+UsePerfData JMXStatus1Test
+ * @run testng/othervm -XX:+UsePerfData JMXStatus2Test
*/
-public class JMXStatusTest {
+abstract public class JMXStatusTest {
private final static String TEST_APP_NAME = "TestApp";
- private final static Pattern DISABLE_AGENT_STATUS = Pattern.compile(
+ protected final static Pattern DISABLED_AGENT_STATUS = Pattern.compile(
"Agent\\s*\\: disabled$"
);
- private final static Pattern LOCAL_AGENT_STATUS = Pattern.compile(
+ protected final static Pattern LOCAL_AGENT_STATUS = Pattern.compile(
"Agent\\s*\\:\\s*enabled\\n+" +
"Connection Type\\s*\\:\\s*local\\n+" +
"Protocol\\s*\\:\\s*[a-z]+\\n+" +
@@ -56,14 +60,15 @@
Pattern.MULTILINE
);
- private final static Pattern REMOTE_AGENT_STATUS = Pattern.compile(
+ protected final static Pattern REMOTE_AGENT_STATUS = Pattern.compile(
"Agent\\s*\\: enabled\\n+" +
+ ".*" +
"Connection Type\\s*\\: remote\\n+" +
"Protocol\\s*\\: [a-z]+\\n+" +
"Host\\s*\\: .+\\n+" +
"URL\\s*\\: service\\:jmx\\:.+\\n+" +
"Properties\\s*\\:\\n+(\\s*\\S+\\s*=\\s*\\S+\\n*)+",
- Pattern.MULTILINE
+ Pattern.MULTILINE | Pattern.DOTALL
);
private static ProcessBuilder testAppPb;
@@ -71,22 +76,24 @@
private ManagementAgentJcmd jcmd;
- @BeforeClass
- public static void setupClass() throws Exception {
- testAppPb = ProcessTools.createJavaProcessBuilder(
- "-cp", System.getProperty("test.class.path"),
- "-XX:+UsePerfData",
- TEST_APP_NAME
- );
- }
+ abstract protected List<String> getCustomVmArgs();
+ abstract protected Pattern getDefaultPattern();
@BeforeTest
- public void setup() {
+ public final void setup() throws Exception {
+ List<String> args = new ArrayList<>();
+ args.add("-cp");
+ args.add(System.getProperty("test.class.path"));
+ args.add("-XX:+UsePerfData");
+ args.addAll(getCustomVmArgs());
+ args.add(TEST_APP_NAME);
+ testAppPb = ProcessTools.createJavaProcessBuilder(args.toArray(new String[args.size()]));
+
jcmd = new ManagementAgentJcmd(TEST_APP_NAME, false);
}
@BeforeMethod
- public void startTestApp() throws Exception {
+ public final void startTestApp() throws Exception {
testApp = ProcessTools.startProcess(
TEST_APP_NAME, testAppPb,
(Predicate<String>)l->l.trim().equals("main enter")
@@ -94,7 +101,7 @@
}
@AfterMethod
- public void stopTestApp() throws Exception {
+ public final void stopTestApp() throws Exception {
testApp.getOutputStream().write(1);
testApp.getOutputStream().flush();
testApp.waitFor();
@@ -102,13 +109,7 @@
}
@Test
- public void testAgentDisabled() throws Exception {
- String status = jcmd.status();
- assertStatusMatches(DISABLE_AGENT_STATUS, status);
- }
-
- @Test
- public void testAgentLocal() throws Exception {
+ public final void testAgentLocal() throws Exception {
jcmd.startLocal();
String status = jcmd.status();
@@ -116,7 +117,7 @@
}
@Test
- public void testAgentRemote() throws Exception {
+ public final void testAgentRemote() throws Exception {
while (true) {
try {
int[] ports = PortAllocator.allocatePorts(1);
@@ -135,11 +136,17 @@
}
}
- private void assertStatusMatches(Pattern expected, String value) {
+ @Test
+ public final void testAgentDefault() throws Exception {
+ String status = jcmd.status();
+ assertStatusMatches(getDefaultPattern(), status);
+ }
+
+ protected void assertStatusMatches(Pattern expected, String value) {
assertStatusMatches(expected, value, "");
}
- private void assertStatusMatches(Pattern expected, String value, String msg) {
+ protected void assertStatusMatches(Pattern expected, String value, String msg) {
int idx = value.indexOf('\n');
if (idx > -1) {
value = value.substring(idx + 1).trim();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java Mon Oct 19 12:30:18 2015 -0700
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.apps.LingeredAppWithDeadlock;
+
+import jdk.testlibrary.Utils;
+import jdk.testlibrary.Platform;
+import jdk.testlibrary.JDKToolLauncher;
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @summary Test deadlock detection
+ * @library /../../test/lib/share/classes
+ * @library /lib/testlibrary
+ * @modules java.management
+ * @build jdk.testlibrary.*
+ * @build jdk.test.lib.apps.*
+ * @build DeadlockDetectionTest
+ * @run main DeadlockDetectionTest
+ */
+public class DeadlockDetectionTest {
+
+ private static LingeredAppWithDeadlock theApp = null;
+ private static ProcessBuilder processBuilder = new ProcessBuilder();
+
+ private static OutputAnalyzer jstack(String... toolArgs) throws Exception {
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstack");
+ launcher.addVMArg("-XX:+UsePerfData");
+ if (toolArgs != null) {
+ for (String toolArg : toolArgs) {
+ launcher.addToolArg(toolArg);
+ }
+ }
+
+ processBuilder.command(launcher.getCommand());
+ System.out.println(processBuilder.command().stream().collect(Collectors.joining(" ")));
+ OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
+ System.out.println(output.getOutput());
+
+ return output;
+ }
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting DeadlockDetectionTest");
+
+ if (!Platform.shouldSAAttach()) {
+ // Silently skip the test if we don't have enough permissions to attach
+ System.err.println("Error! Insufficient permissions to attach.");
+ return;
+ }
+
+ if (!LingeredApp.isLastModifiedWorking()) {
+ // Exact behaviour of the test depends on operating system and the test nature,
+ // so just print the warning and continue
+ System.err.println("Warning! Last modified time doesn't work.");
+ }
+
+ try {
+ List<String> vmArgs = new ArrayList<String>();
+ vmArgs.add("-XX:+UsePerfData");
+ vmArgs.addAll(Utils.getVmOptions());
+
+ theApp = new LingeredAppWithDeadlock();
+ LingeredApp.startApp(vmArgs, theApp);
+ OutputAnalyzer output = jstack(Long.toString(theApp.getPid()));
+ System.out.println(output.getOutput());
+
+ if (output.getExitValue() == 3) {
+ System.out.println("Test can't run for some reason. Skipping");
+ }
+ else {
+ output.shouldHaveExitValue(0);
+ output.shouldContain("Found 1 deadlock.");
+ }
+
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ }
+}