Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8272854: split runtime/CommandLine/PrintTouchedMethods.java test #5231

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, 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
@@ -27,8 +27,7 @@
* @modules java.base/jdk.internal.misc
* java.management
* @library /test/lib
* @compile TestLogTouchedMethods.java PrintTouchedMethods.java
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+LogTouchedMethods PrintTouchedMethods
* @run driver PrintTouchedMethods
*/

import java.io.File;
@@ -44,7 +43,7 @@ public static void main(String args[]) throws Exception {
"-XX:-UnlockDiagnosticVMOptions",
"-XX:+LogTouchedMethods",
"-XX:+PrintTouchedMethodsAtExit",
"TestLogTouchedMethods");
TestLogTouchedMethods.class.getName());

// UnlockDiagnostic turned off, should fail
OutputAnalyzer output = new OutputAnalyzer(pb.start());
@@ -55,7 +54,7 @@ public static void main(String args[]) throws Exception {
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+LogTouchedMethods",
"-XX:+PrintTouchedMethodsAtExit",
"TestLogTouchedMethods");
TestLogTouchedMethods.class.getName());
output = new OutputAnalyzer(pb.start());
// check order:
// 1 "# Method::print_touched_methods version 1" is the first in first line
@@ -82,7 +81,7 @@ public static void main(String args[]) throws Exception {
"-Xint",
"-XX:+LogTouchedMethods",
"-XX:+PrintTouchedMethodsAtExit",
"TestLogTouchedMethods");
TestLogTouchedMethods.class.getName());
output = new OutputAnalyzer(pb.start());
lines = output.asLines();

@@ -105,7 +104,7 @@ public static void main(String args[]) throws Exception {
"-XX:+LogTouchedMethods",
"-XX:+PrintTouchedMethodsAtExit",
"-XX:-TieredCompilation",
"TestLogTouchedMethods");
TestLogTouchedMethods.class.getName());
output = new OutputAnalyzer(pb.start());
lines = output.asLines();

@@ -121,16 +120,5 @@ public static void main(String args[]) throws Exception {
output.shouldContain("TestLogTouchedMethods.methodA:()V");
output.shouldNotContain("TestLogTouchedMethods.methodB:()V");
output.shouldHaveExitValue(0);

// Test jcmd PrintTouchedMethods VM.print_touched_methods
String pid = Long.toString(ProcessTools.getProcessId());
pb = new ProcessBuilder();
pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.print_touched_methods"});
output = new OutputAnalyzer(pb.start());
try {
output.shouldContain("PrintTouchedMethods.main:([Ljava/lang/String;)V");
} catch (RuntimeException e) {
output.shouldContain("Unknown diagnostic command");
}
}
}
}
@@ -0,0 +1,50 @@
/*
* Copyright (c) 2015, 2021, 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 8025692
* @summary Test jcmd PrintTouchedMethods VM.print_touched_methods
* @modules java.base/jdk.internal.misc
* java.management
* @library /test/lib
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+LogTouchedMethods PrintTouchedMethodsJcmd
*/

import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.JDKToolFinder;

public class PrintTouchedMethodsJcmd {

public static void main(String args[]) throws Exception {
var pid = Long.toString(ProcessHandle.current().pid());
var pb = new ProcessBuilder();
pb.command(new String[] {JDKToolFinder.getJDKTool("jcmd"), pid, "VM.print_touched_methods"});
Copy link
Member

@dholmes-ora dholmes-ora Aug 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't you just include the desired VM flags as part of the String[] here and keep everything in one file and using driver mode?

Copy link
Member Author

@iignatev iignatev Oct 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VM flags which we pass here are for jcmd (that connects to the main process), but it's the main process that needs to be run w/ -XX:+UnlockDiagnosticVMOptions -XX:+LogTouchedMethods.

we can keep all testing in one test file by introducing yet another process (which does nothing and just waits for the signal from the main process to exit) and pass its pid to jcmd. IMHO, this will just add unneeded complexity to the test.

var output = new OutputAnalyzer(pb.start());
try {
output.shouldContain("PrintTouchedMethodsJcmd.main:([Ljava/lang/String;)V");
} catch (RuntimeException e) {
output.shouldContain("Unknown diagnostic command");
Copy link
Member

@iklam iklam Oct 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is an existing bug. Do we need this catch block? TouchedMethodsDCmd is always enabled as long as the current JVM has INCLUDE_SERVICES is true. If INCLUDE_SERVICES is false, the jcmd connection will fail, and you will get a different error, like

com.sun.tools.attach.AttachNotSupportedException: Unable to open socket file /proc/18810/root/tmp/.java_pid18810: target process 18810 doesn't respond within 10500ms or HotSpot VM not loaded

The catch block will incorrectly ignore the problem if the VM is incorrectly modified and the TouchedMethodsDCmd is inadvently excluded.

Copy link
Member Author

@iignatev iignatev Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that it doesn't seem we need the catch block here. yet I'd prefer to remove it by a separate RFE.

}
}
}