archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8153026: Change logging tag 'verboseverification' to 'verification'

Browse source 
Changed UL tag to 'verification'

Reviewed-by: hseigel, lfoltan
This commit is contained in:
Rachel Protacio 2016-04-05 09:42:27 -04:00
parent 9438549080
commit d077700179
5 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

28
hotspot/src/share/vm/classfile/verifier.cpp
View file

@ -177,7 +177,7 @@ bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, bool shoul
if (can_failover && !HAS_PENDING_EXCEPTION && if (can_failover && !HAS_PENDING_EXCEPTION &&
(exception_name == vmSymbols::java_lang_VerifyError() || (exception_name == vmSymbols::java_lang_VerifyError() ||
exception_name == vmSymbols::java_lang_ClassFormatError())) { exception_name == vmSymbols::java_lang_ClassFormatError())) {
log_info(verboseverification)("Fail over class verification to old verifier for: %s", klassName); log_info(verification)("Fail over class verification to old verifier for: %s", klassName);
log_info(classinit)("Fail over class verification to old verifier for: %s", klassName); log_info(classinit)("Fail over class verification to old verifier for: %s", klassName);
exception_name = inference_verify( exception_name = inference_verify(
klass, message_buffer, message_buffer_len, THREAD); klass, message_buffer, message_buffer_len, THREAD);
@ -193,8 +193,8 @@ bool Verifier::verify(instanceKlassHandle klass, Verifier::Mode mode, bool shoul
if (log_is_enabled(Info, classinit)){ if (log_is_enabled(Info, classinit)){
log_end_verification(Log(classinit)::info_stream(), klassName, exception_name, THREAD); log_end_verification(Log(classinit)::info_stream(), klassName, exception_name, THREAD);
} }
if (log_is_enabled(Info, verboseverification)){ if (log_is_enabled(Info, verification)){
log_end_verification(Log(verboseverification)::info_stream(), klassName, exception_name, THREAD); log_end_verification(Log(verification)::info_stream(), klassName, exception_name, THREAD);
} }
if (HAS_PENDING_EXCEPTION) { if (HAS_PENDING_EXCEPTION) {
@ -268,7 +268,7 @@ Symbol* Verifier::inference_verify(
} }
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
log_info(verboseverification)("Verifying class %s with old format", klass->external_name()); log_info(verification)("Verifying class %s with old format", klass->external_name());
jclass cls = (jclass) JNIHandles::make_local(env, klass->java_mirror()); jclass cls = (jclass) JNIHandles::make_local(env, klass->java_mirror());
jint result; jint result;
@ -580,7 +580,7 @@ TypeOrigin ClassVerifier::ref_ctx(const char* sig, TRAPS) {
} }
void ClassVerifier::verify_class(TRAPS) { void ClassVerifier::verify_class(TRAPS) {
log_info(verboseverification)("Verifying class %s with new format", _klass->external_name()); log_info(verification)("Verifying class %s with new format", _klass->external_name());
Array<Method*>* methods = _klass->methods(); Array<Method*>* methods = _klass->methods();
int num_methods = methods->length(); int num_methods = methods->length();
@ -600,7 +600,7 @@ void ClassVerifier::verify_class(TRAPS) {
} }
if (was_recursively_verified()){ if (was_recursively_verified()){
log_info(verboseverification)("Recursive verification detected for: %s", _klass->external_name()); log_info(verification)("Recursive verification detected for: %s", _klass->external_name());
log_info(classinit)("Recursive verification detected for: %s", log_info(classinit)("Recursive verification detected for: %s",
_klass->external_name()); _klass->external_name());
} }
@ -609,7 +609,7 @@ void ClassVerifier::verify_class(TRAPS) {
void ClassVerifier::verify_method(const methodHandle& m, TRAPS) { void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
HandleMark hm(THREAD); HandleMark hm(THREAD);
_method = m; // initialize _method _method = m; // initialize _method
log_info(verboseverification)("Verifying method %s", m->name_and_sig_as_C_string()); log_info(verification)("Verifying method %s", m->name_and_sig_as_C_string());
// For clang, the only good constant format string is a literal constant format string. // For clang, the only good constant format string is a literal constant format string.
#define bad_type_msg "Bad type on operand stack in %s" #define bad_type_msg "Bad type on operand stack in %s"
@ -656,9 +656,9 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
StackMapTable stackmap_table(&reader, &current_frame, max_locals, max_stack, StackMapTable stackmap_table(&reader, &current_frame, max_locals, max_stack,
code_data, code_length, CHECK_VERIFY(this)); code_data, code_length, CHECK_VERIFY(this));
if (log_is_enabled(Info, verboseverification)) { if (log_is_enabled(Info, verification)) {
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
stackmap_table.print_on(Log(verboseverification)::info_stream()); stackmap_table.print_on(Log(verification)::info_stream());
} }
RawBytecodeStream bcs(m); RawBytecodeStream bcs(m);
@ -698,10 +698,10 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
VerificationType type, type2; VerificationType type, type2;
VerificationType atype; VerificationType atype;
if (log_is_enabled(Info, verboseverification)) { if (log_is_enabled(Info, verification)) {
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
current_frame.print_on(Log(verboseverification)::info_stream()); current_frame.print_on(Log(verification)::info_stream());
log_info(verboseverification)("offset = %d, opcode = %s", bci, Bytecodes::name(opcode)); log_info(verification)("offset = %d, opcode = %s", bci, Bytecodes::name(opcode));
} }
// Make sure wide instruction is in correct format // Make sure wide instruction is in correct format
@ -2522,9 +2522,9 @@ void ClassVerifier::verify_invoke_init(
verify_error(ErrorContext::bad_code(bci), verify_error(ErrorContext::bad_code(bci),
"Bad <init> method call from after the start of a try block"); "Bad <init> method call from after the start of a try block");
return; return;
} else if (log_is_enabled(Info, verboseverification)) { } else if (log_is_enabled(Info, verification)) {
ResourceMark rm(THREAD); ResourceMark rm(THREAD);
log_info(verboseverification)("Survived call to ends_in_athrow(): %s", log_info(verification)("Survived call to ends_in_athrow(): %s",
current_class()->name()->as_C_string()); current_class()->name()->as_C_string());
} }
} }

2
hotspot/src/share/vm/logging/logTag.hpp
View file

@ -96,7 +96,7 @@
LOG_TAG(thread) \ LOG_TAG(thread) \
LOG_TAG(tlab) \ LOG_TAG(tlab) \
LOG_TAG(time) \ LOG_TAG(time) \
LOG_TAG(verboseverification) \ LOG_TAG(verification) \
LOG_TAG(verify) \ LOG_TAG(verify) \
LOG_TAG(vmoperation) \ LOG_TAG(vmoperation) \
LOG_TAG(vtables) \ LOG_TAG(vtables) \

2
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -433,7 +433,7 @@ static AliasedFlag const removed_develop_logging_flags[] = {
{ "TraceStartupTime", "-Xlog:startuptime" }, { "TraceStartupTime", "-Xlog:startuptime" },
{ "TraceVMOperation", "-Xlog:vmoperation=debug" }, { "TraceVMOperation", "-Xlog:vmoperation=debug" },
{ "PrintVtables", "-Xlog:vtables=debug" }, { "PrintVtables", "-Xlog:vtables=debug" },
{ "VerboseVerification", "-Xlog:verboseverification" }, { "VerboseVerification", "-Xlog:verification" },
{ NULL, NULL } { NULL, NULL }
}; };
#endif //PRODUCT #endif //PRODUCT

2
hotspot/test/runtime/logging/RemovedDevelopFlagsTest.java
View file

@ -57,7 +57,7 @@ public class RemovedDevelopFlagsTest {
exec("TraceStartupTime", "-Xlog:startuptime"); exec("TraceStartupTime", "-Xlog:startuptime");
exec("TraceVMOperation", "-Xlog:vmoperation=debug"); exec("TraceVMOperation", "-Xlog:vmoperation=debug");
exec("PrintVtables", "-Xlog:vtables=debug"); exec("PrintVtables", "-Xlog:vtables=debug");
exec("VerboseVerification", "-Xlog:verboseverification"); exec("VerboseVerification", "-Xlog:verification");
} }
}; };
} }

22
hotspot/test/runtime/logging/VerboseVerificationTest.java → hotspot/test/runtime/logging/VerificationTest.java
View file

@ -24,46 +24,46 @@
/* /*
* @test * @test
* @bug 8150083 * @bug 8150083
* @summary verboseverification=info output should have output from the code * @summary verification=info output should have output from the code
* @library /testlibrary * @library /testlibrary
* @modules java.base/sun.misc * @modules java.base/sun.misc
* java.management * java.management
* @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver VerboseVerificationTest * @run driver VerificationTest
*/ */
import jdk.test.lib.OutputAnalyzer; import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.ProcessTools; import jdk.test.lib.ProcessTools;
public class VerboseVerificationTest { public class VerificationTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception { static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
OutputAnalyzer output = new OutputAnalyzer(pb.start()); OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("[verboseverification]"); output.shouldContain("[verification]");
output.shouldContain("Verifying class VerboseVerificationTest$InternalClass with new format"); output.shouldContain("Verifying class VerificationTest$InternalClass with new format");
output.shouldContain("Verifying method VerboseVerificationTest$InternalClass.<init>()V"); output.shouldContain("Verifying method VerificationTest$InternalClass.<init>()V");
output.shouldContain("End class verification for: VerboseVerificationTest$InternalClass"); output.shouldContain("End class verification for: VerificationTest$InternalClass");
output.shouldHaveExitValue(0); output.shouldHaveExitValue(0);
} }
static void analyzeOutputOff(ProcessBuilder pb) throws Exception { static void analyzeOutputOff(ProcessBuilder pb) throws Exception {
OutputAnalyzer output = new OutputAnalyzer(pb.start()); OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotContain("[verboseverification]"); output.shouldNotContain("[verification]");
output.shouldHaveExitValue(0); output.shouldHaveExitValue(0);
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:verboseverification=info", ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:verification=info",
InternalClass.class.getName()); InternalClass.class.getName());
analyzeOutputOn(pb); analyzeOutputOn(pb);
pb = ProcessTools.createJavaProcessBuilder("-Xlog:verboseverification=off", pb = ProcessTools.createJavaProcessBuilder("-Xlog:verification=off",
InternalClass.class.getName()); InternalClass.class.getName());
analyzeOutputOff(pb); analyzeOutputOff(pb);
} }
public static class InternalClass { public static class InternalClass {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
System.out.println("VerboseVerificationTest"); System.out.println("VerificationTest");
} }
} }
} }