Merge
This commit is contained in:
commit
ce7e3e24e4
@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2016, 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 jdk.test.lib.apps.LingeredApp;
|
||||
|
||||
interface Language {
|
||||
static final long nbrOfWords = 99999;
|
||||
public abstract long getNbrOfWords();
|
||||
default boolean hasScript() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
class ParselTongue implements Language {
|
||||
public long getNbrOfWords() {
|
||||
return nbrOfWords * 4;
|
||||
}
|
||||
}
|
||||
|
||||
class SlytherinSpeak extends ParselTongue {
|
||||
public boolean hasScript() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public class LingeredAppWithDefaultMethods extends LingeredApp {
|
||||
|
||||
public static void main(String args[]) {
|
||||
ParselTongue lang = new ParselTongue();
|
||||
SlytherinSpeak slang = new SlytherinSpeak();
|
||||
System.out.println(lang.hasScript() || slang.hasScript());
|
||||
|
||||
LingeredApp.main(args);
|
||||
}
|
||||
}
|
157
hotspot/test/serviceability/sa/TestDefaultMethods.java
Normal file
157
hotspot/test/serviceability/sa/TestDefaultMethods.java
Normal file
@ -0,0 +1,157 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2016, 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 sun.jvm.hotspot.HotSpotAgent;
|
||||
import sun.jvm.hotspot.utilities.SystemDictionaryHelper;
|
||||
import sun.jvm.hotspot.oops.InstanceKlass;
|
||||
import sun.jvm.hotspot.debugger.*;
|
||||
import sun.jvm.hotspot.oops.Method;
|
||||
import sun.jvm.hotspot.utilities.MethodArray;
|
||||
|
||||
import jdk.test.lib.apps.LingeredApp;
|
||||
import jdk.test.lib.JDKToolLauncher;
|
||||
import jdk.test.lib.JDKToolFinder;
|
||||
import jdk.test.lib.Platform;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
import jdk.test.lib.Utils;
|
||||
import jdk.test.lib.Asserts;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @library /test/lib
|
||||
* @requires os.family != "mac"
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* jdk.hotspot.agent/sun.jvm.hotspot
|
||||
* jdk.hotspot.agent/sun.jvm.hotspot.utilities
|
||||
* jdk.hotspot.agent/sun.jvm.hotspot.oops
|
||||
* jdk.hotspot.agent/sun.jvm.hotspot.debugger
|
||||
* @run main/othervm TestDefaultMethods
|
||||
*/
|
||||
|
||||
public class TestDefaultMethods {
|
||||
|
||||
private static LingeredAppWithDefaultMethods theApp = null;
|
||||
|
||||
private static void printDefaultMethods(String pid,
|
||||
String[] instanceKlassNames) {
|
||||
HotSpotAgent agent = new HotSpotAgent();
|
||||
try {
|
||||
agent.attach(Integer.parseInt(pid));
|
||||
}
|
||||
catch (DebuggerException e) {
|
||||
System.out.println(e.getMessage());
|
||||
System.err.println("Unable to connect to process ID: " + pid);
|
||||
|
||||
agent.detach();
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
for (String instanceKlassName : instanceKlassNames) {
|
||||
InstanceKlass iKlass = SystemDictionaryHelper.findInstanceKlass(instanceKlassName);
|
||||
MethodArray methods = iKlass.getMethods();
|
||||
MethodArray defaultMethods = iKlass.getDefaultMethods();
|
||||
for (int i = 0; i < methods.length(); i++) {
|
||||
Method m = methods.at(i);
|
||||
System.out.println("Method: " + m.getName().asString() +
|
||||
" in instance klass: " + instanceKlassName);
|
||||
}
|
||||
if (defaultMethods != null) {
|
||||
for (int j = 0; j < defaultMethods.length(); j++) {
|
||||
Method dm = defaultMethods.at(j);
|
||||
System.out.println("Default method: " + dm.getName().asString() +
|
||||
" in instance klass: " + instanceKlassName);
|
||||
}
|
||||
} else {
|
||||
System.out.println("No default methods in " + instanceKlassName);
|
||||
}
|
||||
|
||||
}
|
||||
agent.detach();
|
||||
}
|
||||
|
||||
private static void createAnotherToAttach(
|
||||
String[] instanceKlassNames,
|
||||
long lingeredAppPid) throws Exception {
|
||||
|
||||
String[] toolArgs = {
|
||||
"--add-modules=jdk.hotspot.agent",
|
||||
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED",
|
||||
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.utilities=ALL-UNNAMED",
|
||||
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.oops=ALL-UNNAMED",
|
||||
"--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.debugger=ALL-UNNAMED",
|
||||
"TestDefaultMethods",
|
||||
Long.toString(lingeredAppPid)
|
||||
};
|
||||
|
||||
// Start a new process to attach to the lingered app
|
||||
ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(toolArgs);
|
||||
OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder);
|
||||
SAOutput.shouldHaveExitValue(0);
|
||||
System.out.println(SAOutput.getOutput());
|
||||
|
||||
SAOutput.shouldContain(
|
||||
"Default method: hasScript in instance klass: " + instanceKlassNames[1]);
|
||||
SAOutput.shouldContain(
|
||||
"No default methods in " + instanceKlassNames[0]);
|
||||
SAOutput.shouldContain(
|
||||
"Method: hasScript in instance klass: " + instanceKlassNames[0]);
|
||||
SAOutput.shouldContain(
|
||||
"No default methods in " + instanceKlassNames[2]);
|
||||
}
|
||||
|
||||
public static void main (String... args) throws Exception {
|
||||
|
||||
String[] instanceKlassNames = new String[] {
|
||||
"Language",
|
||||
"ParselTongue",
|
||||
"SlytherinSpeak"
|
||||
};
|
||||
|
||||
if (!Platform.shouldSAAttach()) {
|
||||
System.out.println(
|
||||
"SA attach not expected to work - test skipped.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (args == null || args.length == 0) {
|
||||
try {
|
||||
List<String> vmArgs = new ArrayList<String>();
|
||||
vmArgs.add("-XX:+UsePerfData");
|
||||
vmArgs.addAll(Utils.getVmOptions());
|
||||
|
||||
theApp = new LingeredAppWithDefaultMethods();
|
||||
LingeredApp.startApp(vmArgs, theApp);
|
||||
createAnotherToAttach(instanceKlassNames,
|
||||
theApp.getPid());
|
||||
} finally {
|
||||
LingeredApp.stopApp(theApp);
|
||||
}
|
||||
} else {
|
||||
printDefaultMethods(args[0], instanceKlassNames);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user