8145627: sun.jvm.hotspot.oops.InstanceKlass::getSize() returns the incorrect size and has no test
Fix the size and add a test Reviewed-by: sspitsyn
This commit is contained in:
Jini George
Serguei Spitsyn
parent
15fafcc1fc
commit
73a516d68e
@ -242,7 +242,15 @@ public class InstanceKlass extends Klass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public long getSize() {
|
public long getSize() {
|
||||||
return alignSize(getHeaderSize() + getVtableLen() + getItableLen() + getNonstaticOopMapSize());
|
long wordLength = VM.getVM().getBytesPerWord();
|
||||||
|
long size = getHeaderSize() +
|
||||||
|
(getVtableLen() +
|
||||||
|
getItableLen() +
|
||||||
|
getNonstaticOopMapSize()) * wordLength;
|
||||||
|
if (isInterface()) {
|
||||||
|
size += wordLength;
|
||||||
|
}
|
||||||
|
return alignSize(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long getHeaderSize() { return headerSize; }
|
public static long getHeaderSize() { return headerSize; }
|
||||||
|
|||||||
198
hotspot/test/serviceability/sa/TestInstanceKlassSize.java
Normal file
198
hotspot/test/serviceability/sa/TestInstanceKlassSize.java
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
/*
|
||||||
|
* 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 sun.jvm.hotspot.HotSpotAgent;
|
||||||
|
import sun.jvm.hotspot.utilities.SystemDictionaryHelper;
|
||||||
|
import sun.jvm.hotspot.debugger.*;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import jdk.test.lib.JDKToolLauncher;
|
||||||
|
import jdk.test.lib.Platform;
|
||||||
|
import jdk.test.lib.ProcessTools;
|
||||||
|
import jdk.test.lib.OutputAnalyzer;
|
||||||
|
import jdk.test.lib.Utils;
|
||||||
|
import jdk.test.lib.apps.LingeredApp;
|
||||||
|
import jdk.test.lib.Asserts;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @library /test/lib/share/classes
|
||||||
|
* @library /testlibrary
|
||||||
|
* @build jdk.test.lib.*
|
||||||
|
* @build jdk.test.lib.apps.*
|
||||||
|
* @modules java.base/jdk.internal.misc
|
||||||
|
* @modules jdk.hotspot.agent
|
||||||
|
* @modules jdk.hotspot.agent/sun.jvm.hotspot
|
||||||
|
* @modules jdk.hotspot.agent/sun.jvm.hotspot.utilities
|
||||||
|
* @modules jdk.hotspot.agent/sun.jvm.hotspot.oops
|
||||||
|
* @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent TestInstanceKlassSize.java
|
||||||
|
* @run main/othervm TestInstanceKlassSize
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class TestInstanceKlassSize {
|
||||||
|
|
||||||
|
private static String getJcmdInstanceKlassSize(OutputAnalyzer output,
|
||||||
|
String instanceKlassName) {
|
||||||
|
for (String s : output.asLines()) {
|
||||||
|
if (s.contains(instanceKlassName)) {
|
||||||
|
String tokens[];
|
||||||
|
System.out.println(s);
|
||||||
|
tokens = s.split("\\s+");
|
||||||
|
return tokens[3];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static OutputAnalyzer jcmd(Long pid,
|
||||||
|
String... toolArgs) throws Exception {
|
||||||
|
ProcessBuilder processBuilder = new ProcessBuilder();
|
||||||
|
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd");
|
||||||
|
launcher.addToolArg(Long.toString(pid));
|
||||||
|
if (toolArgs != null) {
|
||||||
|
for (String toolArg : toolArgs) {
|
||||||
|
launcher.addToolArg(toolArg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
processBuilder.command(launcher.getCommand());
|
||||||
|
System.out.println(
|
||||||
|
processBuilder.command().stream().collect(Collectors.joining(" ")));
|
||||||
|
return ProcessTools.executeProcess(processBuilder);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void startMeWithArgs() throws Exception {
|
||||||
|
|
||||||
|
LingeredApp app = null;
|
||||||
|
OutputAnalyzer output = null;
|
||||||
|
try {
|
||||||
|
List<String> vmArgs = new ArrayList<String>();
|
||||||
|
vmArgs.add("-XX:+UnlockDiagnosticVMOptions");
|
||||||
|
vmArgs.add("-XX:+UsePerfData");
|
||||||
|
vmArgs.addAll(Utils.getVmOptions());
|
||||||
|
app = LingeredApp.startApp(vmArgs);
|
||||||
|
System.out.println ("Started LingeredApp with pid " + app.getPid());
|
||||||
|
} catch (Exception ex) {
|
||||||
|
ex.printStackTrace();
|
||||||
|
throw new RuntimeException(ex);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
String[] instanceKlassNames = new String[] {
|
||||||
|
" java.lang.Object",
|
||||||
|
" java.util.Vector",
|
||||||
|
" sun.util.PreHashedMap",
|
||||||
|
" java.lang.String",
|
||||||
|
" java.lang.Thread",
|
||||||
|
" java.lang.Byte",
|
||||||
|
};
|
||||||
|
String[] toolArgs = {
|
||||||
|
"-XX:+UnlockDiagnosticVMOptions",
|
||||||
|
"-XaddExports:jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED",
|
||||||
|
"-XaddExports:jdk.hotspot.agent/sun.jvm.hotspot.utilities=ALL-UNNAMED",
|
||||||
|
"-XaddExports:jdk.hotspot.agent/sun.jvm.hotspot.oops=ALL-UNNAMED",
|
||||||
|
"TestInstanceKlassSize",
|
||||||
|
Long.toString(app.getPid())
|
||||||
|
};
|
||||||
|
|
||||||
|
OutputAnalyzer jcmdOutput = jcmd(
|
||||||
|
app.getPid(),
|
||||||
|
"GC.class_stats", "VTab,ITab,OopMap,KlassBytes");
|
||||||
|
ProcessBuilder processBuilder = ProcessTools
|
||||||
|
.createJavaProcessBuilder(toolArgs);
|
||||||
|
output = ProcessTools.executeProcess(processBuilder);
|
||||||
|
System.out.println(output.getOutput());
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
|
||||||
|
// Check whether the size matches that which jcmd outputs
|
||||||
|
for (String instanceKlassName : instanceKlassNames) {
|
||||||
|
System.out.println ("Trying to match for" + instanceKlassName);
|
||||||
|
String jcmdInstanceKlassSize = getJcmdInstanceKlassSize(
|
||||||
|
jcmdOutput,
|
||||||
|
instanceKlassName);
|
||||||
|
for (String s : output.asLines()) {
|
||||||
|
if (s.contains(instanceKlassName)) {
|
||||||
|
Asserts.assertTrue(
|
||||||
|
s.contains(jcmdInstanceKlassSize),
|
||||||
|
"The size computed by SA for" +
|
||||||
|
instanceKlassName + " does not match.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
LingeredApp.stopApp(app);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SAInstanceKlassSize(int pid,
|
||||||
|
String[] SAInstanceKlassNames) {
|
||||||
|
HotSpotAgent agent = new HotSpotAgent();
|
||||||
|
try {
|
||||||
|
agent.attach(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 SAInstanceKlassName : SAInstanceKlassNames) {
|
||||||
|
Long size = SystemDictionaryHelper.findInstanceKlass(
|
||||||
|
SAInstanceKlassName).getSize();
|
||||||
|
System.out.println("SA: The size of " + SAInstanceKlassName +
|
||||||
|
" is " + size);
|
||||||
|
}
|
||||||
|
agent.detach();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
|
||||||
|
if (!Platform.shouldSAAttach()) {
|
||||||
|
System.out.println("SA attach not expected to work - test skipped.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args == null || args.length == 0) {
|
||||||
|
System.out.println ("No args run. Starting with args now.");
|
||||||
|
startMeWithArgs();
|
||||||
|
} else {
|
||||||
|
String[] SAInstanceKlassNames = new String[] {
|
||||||
|
"java.lang.Object",
|
||||||
|
"java.util.Vector",
|
||||||
|
"sun.util.PreHashedMap",
|
||||||
|
"java.lang.String",
|
||||||
|
"java.lang.Thread",
|
||||||
|
"java.lang.Byte"
|
||||||
|
};
|
||||||
|
SAInstanceKlassSize(Integer.parseInt(args[0]), SAInstanceKlassNames);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,185 @@
|
|||||||
|
/*
|
||||||
|
* 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 sun.jvm.hotspot.HotSpotAgent;
|
||||||
|
import sun.jvm.hotspot.utilities.SystemDictionaryHelper;
|
||||||
|
import sun.jvm.hotspot.oops.InstanceKlass;
|
||||||
|
import sun.jvm.hotspot.debugger.*;
|
||||||
|
|
||||||
|
import jdk.test.lib.JDKToolLauncher;
|
||||||
|
import jdk.test.lib.JDKToolFinder;
|
||||||
|
import jdk.test.lib.Platform;
|
||||||
|
import jdk.test.lib.ProcessTools;
|
||||||
|
import jdk.test.lib.OutputAnalyzer;
|
||||||
|
import jdk.test.lib.Utils;
|
||||||
|
import jdk.test.lib.Asserts;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @library /test/lib/share/classes
|
||||||
|
* @library /testlibrary
|
||||||
|
* @build jdk.test.lib.*
|
||||||
|
* @build jdk.test.lib.apps.*
|
||||||
|
* @modules java.base/jdk.internal.misc
|
||||||
|
* @modules jdk.hotspot.agent
|
||||||
|
* @modules jdk.hotspot.agent/sun.jvm.hotspot
|
||||||
|
* @modules jdk.hotspot.agent/sun.jvm.hotspot.utilities
|
||||||
|
* @modules jdk.hotspot.agent/sun.jvm.hotspot.oops
|
||||||
|
* @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent TestInstanceKlassSizeForInterface.java
|
||||||
|
* @run main/othervm TestInstanceKlassSizeForInterface
|
||||||
|
*/
|
||||||
|
|
||||||
|
interface Language {
|
||||||
|
static final long nbrOfWords = 99999;
|
||||||
|
public abstract long getNbrOfWords();
|
||||||
|
}
|
||||||
|
|
||||||
|
class ParselTongue implements Language {
|
||||||
|
public long getNbrOfWords() {
|
||||||
|
return nbrOfWords * 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TestInstanceKlassSizeForInterface {
|
||||||
|
|
||||||
|
private static void SAInstanceKlassSize(int pid,
|
||||||
|
String[] instanceKlassNames) {
|
||||||
|
|
||||||
|
HotSpotAgent agent = new HotSpotAgent();
|
||||||
|
try {
|
||||||
|
agent.attach((int)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);
|
||||||
|
System.out.println("SA: The size of " + instanceKlassName +
|
||||||
|
" is " + iKlass.getSize());
|
||||||
|
}
|
||||||
|
agent.detach();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getJcmdInstanceKlassSize(OutputAnalyzer output,
|
||||||
|
String instanceKlassName) {
|
||||||
|
for (String s : output.asLines()) {
|
||||||
|
if (s.contains(instanceKlassName)) {
|
||||||
|
String tokens[];
|
||||||
|
System.out.println(s);
|
||||||
|
tokens = s.split("\\s+");
|
||||||
|
return tokens[3];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void createAnotherToAttach(
|
||||||
|
String[] instanceKlassNames) throws Exception {
|
||||||
|
|
||||||
|
ProcessBuilder pb = new ProcessBuilder();
|
||||||
|
|
||||||
|
// Grab the pid from the current java process and pass it
|
||||||
|
String[] toolArgs = {
|
||||||
|
"-XX:+UnlockDiagnosticVMOptions",
|
||||||
|
"-XaddExports:jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED",
|
||||||
|
"-XaddExports:jdk.hotspot.agent/sun.jvm.hotspot.utilities=ALL-UNNAMED",
|
||||||
|
"-XaddExports:jdk.hotspot.agent/sun.jvm.hotspot.oops=ALL-UNNAMED",
|
||||||
|
"TestInstanceKlassSizeForInterface",
|
||||||
|
Long.toString(ProcessTools.getProcessId())
|
||||||
|
};
|
||||||
|
|
||||||
|
pb.command(new String[] {
|
||||||
|
JDKToolFinder.getJDKTool("jcmd"),
|
||||||
|
Long.toString(ProcessTools.getProcessId()),
|
||||||
|
"GC.class_stats",
|
||||||
|
"VTab,ITab,OopMap,KlassBytes"
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
// Start a new process to attach to the current process
|
||||||
|
ProcessBuilder processBuilder = ProcessTools
|
||||||
|
.createJavaProcessBuilder(toolArgs);
|
||||||
|
OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder);
|
||||||
|
System.out.println(SAOutput.getOutput());
|
||||||
|
|
||||||
|
OutputAnalyzer jcmdOutput = new OutputAnalyzer(pb.start());
|
||||||
|
System.out.println(jcmdOutput.getOutput());
|
||||||
|
|
||||||
|
// Match the sizes from both the output streams
|
||||||
|
for (String instanceKlassName : instanceKlassNames) {
|
||||||
|
System.out.println ("Trying to match for " + instanceKlassName);
|
||||||
|
String jcmdInstanceKlassSize = getJcmdInstanceKlassSize(
|
||||||
|
jcmdOutput,
|
||||||
|
instanceKlassName);
|
||||||
|
for (String s : SAOutput.asLines()) {
|
||||||
|
if (s.contains(instanceKlassName)) {
|
||||||
|
Asserts.assertTrue(
|
||||||
|
s.contains(jcmdInstanceKlassSize),
|
||||||
|
"The size computed by SA for " +
|
||||||
|
instanceKlassName + " does not match.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main (String... args) throws Exception {
|
||||||
|
String[] instanceKlassNames = new String[] {
|
||||||
|
"Language",
|
||||||
|
"ParselTongue",
|
||||||
|
"TestInstanceKlassSizeForInterface$1"
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!Platform.shouldSAAttach()) {
|
||||||
|
System.out.println(
|
||||||
|
"SA attach not expected to work - test skipped.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( args == null || args.length == 0 ) {
|
||||||
|
ParselTongue lang = new ParselTongue();
|
||||||
|
|
||||||
|
Language ventro = new Language() {
|
||||||
|
public long getNbrOfWords() {
|
||||||
|
return nbrOfWords * 8;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Not tested at this point. The test needs to be enhanced
|
||||||
|
// later to test for the sizes of the Lambda MetaFactory
|
||||||
|
// generated anonymous classes too. (After JDK-8160228 gets
|
||||||
|
// fixed.)
|
||||||
|
Runnable r2 = () -> System.out.println("Hello world!");
|
||||||
|
r2.run();
|
||||||
|
|
||||||
|
createAnotherToAttach(instanceKlassNames);
|
||||||
|
} else {
|
||||||
|
SAInstanceKlassSize(Integer.parseInt(args[0]), instanceKlassNames);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user