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

8271303: jcmd VM.cds {static, dynamic}_dump should print more info

Browse Source 
Reviewed-by: iklam, ccheung
This commit is contained in:
Yumin Qi 2021-09-27 21:27:00 +00:00
parent 5b660f3347
commit c4b52c7378
3 changed files with 15 additions and 6 deletions
src
hotspot/share
classfile
vmSymbols.hpp
services
diagnosticCommand.cpp
java.base/share/classes/jdk/internal/misc
CDS.java

2
src/hotspot/share/classfile/vmSymbols.hpp

@ -697,7 +697,7 @@
\
/* CDS */ \
template(dumpSharedArchive, "dumpSharedArchive") \
template(dumpSharedArchive_signature, "(ZLjava/lang/String;)V") \
template(dumpSharedArchive_signature, "(ZLjava/lang/String;)Ljava/lang/String;") \
template(generateLambdaFormHolderClasses, "generateLambdaFormHolderClasses") \
template(generateLambdaFormHolderClasses_signature, "([Ljava/lang/String;)[Ljava/lang/Object;") \
template(java_lang_invoke_Invokers_Holder, "java/lang/invoke/Invokers$Holder") \

12
src/hotspot/share/services/diagnosticCommand.cpp

@ -964,10 +964,10 @@ void DumpSharedArchiveDCmd::execute(DCmdSource source, TRAPS) {
if (strcmp(scmd, "static_dump") == 0) {
is_static = JNI_TRUE;
output()->print_cr("Static dump:");
output()->print("Static dump: ");
} else if (strcmp(scmd, "dynamic_dump") == 0) {
is_static = JNI_FALSE;
output()->print_cr("Dynamic dump:");
output()->print("Dynamic dump: ");
if (!UseSharedSpaces) {
output()->print_cr("Dynamic dump is unsupported when base CDS archive is not loaded");
return;
@ -988,7 +988,7 @@ void DumpSharedArchiveDCmd::execute(DCmdSource source, TRAPS) {
}
Symbol* cds_name = vmSymbols::jdk_internal_misc_CDS();
Klass* cds_klass = SystemDictionary::resolve_or_fail(cds_name, true /*throw error*/, CHECK);
JavaValue result(T_VOID);
JavaValue result(T_OBJECT);
JavaCallArguments args;
args.push_int(is_static);
args.push_oop(fileh);
@ -997,6 +997,12 @@ void DumpSharedArchiveDCmd::execute(DCmdSource source, TRAPS) {
vmSymbols::dumpSharedArchive(),
vmSymbols::dumpSharedArchive_signature(),
&args, CHECK);
if (!HAS_PENDING_EXCEPTION) {
assert(result.get_type() == T_OBJECT, "Sanity check");
// result contains the archive name
char* archive_name = java_lang_String::as_utf8_string(result.get_oop());
output()->print_cr("%s", archive_name);
}
}
#endif // INCLUDE_CDS

7
src/java.base/share/classes/jdk/internal/misc/CDS.java

@ -254,8 +254,9 @@ public class CDS {
* called from jcmd VM.cds to dump static or dynamic shared archive
* @param isStatic true for dump static archive or false for dynnamic archive.
* @param fileName user input archive name, can be null.
* @return The archive name if successfully dumped.
*/
private static void dumpSharedArchive(boolean isStatic, String fileName) throws Exception {
private static String dumpSharedArchive(boolean isStatic, String fileName) throws Exception {
String cwd = new File("").getAbsolutePath(); // current dir used for printing message.
String currentPid = String.valueOf(ProcessHandle.current().pid());
String archiveFileName = fileName != null ? fileName :
@ -333,6 +334,8 @@ public class CDS {
throw new RuntimeException("Cannot rename temp file " + tempArchiveFileName + " to archive file" + archiveFileName);
}
// Everyting goes well, print out the file name.
System.out.println((isStatic ? "Static" : " Dynamic") + " dump to file " + cwd + File.separator + archiveFileName);
String archiveFilePath = new File(archiveFileName).getAbsolutePath();
System.out.println("The process was attached by jcmd and dumped a " + (isStatic ? "static" : "dynamic") + " archive " + archiveFilePath);
return archiveFilePath;
}
}