mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
7182152: Instrumentation hot swap test incorrect monitor count
Add/refine new tracing support using -XX:TraceRedefineClasses=16384. Reviewed-by: coleenp, acorn, sspitsyn
This commit is contained in:
Daniel D. Daugherty
parent
de47c5722f
commit
8ef946f380
11 changed files with 253 additions and 152 deletions
|
|
@ -154,8 +154,15 @@ void VM_RedefineClasses::doit() {
|
|||
// See jvmtiExport.hpp for detailed explanation.
|
||||
JvmtiExport::set_has_redefined_a_class();
|
||||
|
||||
#ifdef ASSERT
|
||||
SystemDictionary::classes_do(check_class, thread);
|
||||
// check_class() is optionally called for product bits, but is
|
||||
// always called for non-product bits.
|
||||
#ifdef PRODUCT
|
||||
if (RC_TRACE_ENABLED(0x00004000)) {
|
||||
#endif
|
||||
RC_TRACE_WITH_THREAD(0x00004000, thread, ("calling check_class"));
|
||||
SystemDictionary::classes_do(check_class, thread);
|
||||
#ifdef PRODUCT
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -1564,9 +1571,9 @@ void VM_RedefineClasses::rewrite_cp_refs_in_method(methodHandle method,
|
|||
bcp, cp_index, new_index));
|
||||
// Rewriter::rewrite_method() uses put_native_u2() in this
|
||||
// situation because it is reusing the constant pool index
|
||||
// location for a native index into the constantPoolCache.
|
||||
// location for a native index into the ConstantPoolCache.
|
||||
// Since we are updating the constant pool index prior to
|
||||
// verification and constantPoolCache initialization, we
|
||||
// verification and ConstantPoolCache initialization, we
|
||||
// need to keep the new index in Java byte order.
|
||||
Bytes::put_Java_u2(p, new_index);
|
||||
}
|
||||
|
|
@ -3371,7 +3378,6 @@ void VM_RedefineClasses::increment_class_counter(InstanceKlass *ik, TRAPS) {
|
|||
}
|
||||
}
|
||||
|
||||
#ifndef PRODUCT
|
||||
void VM_RedefineClasses::check_class(Klass* k_oop,
|
||||
ClassLoaderData* initiating_loader,
|
||||
TRAPS) {
|
||||
|
|
@ -3379,82 +3385,110 @@ void VM_RedefineClasses::check_class(Klass* k_oop,
|
|||
if (k->oop_is_instance()) {
|
||||
HandleMark hm(THREAD);
|
||||
InstanceKlass *ik = (InstanceKlass *) k;
|
||||
bool no_old_methods = true; // be optimistic
|
||||
ResourceMark rm(THREAD);
|
||||
|
||||
if (ik->vtable_length() > 0) {
|
||||
ResourceMark rm(THREAD);
|
||||
if (!ik->vtable()->check_no_old_entries()) {
|
||||
tty->print_cr("klassVtable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name());
|
||||
// a vtable should never contain old or obsolete methods
|
||||
if (ik->vtable_length() > 0 &&
|
||||
!ik->vtable()->check_no_old_or_obsolete_entries()) {
|
||||
if (RC_TRACE_ENABLED(0x00004000)) {
|
||||
RC_TRACE_WITH_THREAD(0x00004000, THREAD,
|
||||
("klassVtable::check_no_old_or_obsolete_entries failure"
|
||||
" -- OLD or OBSOLETE method found -- class: %s",
|
||||
ik->signature_name()));
|
||||
ik->vtable()->dump_vtable();
|
||||
assert(false, "OLD method found");
|
||||
}
|
||||
no_old_methods = false;
|
||||
}
|
||||
if (ik->itable_length() > 0) {
|
||||
ResourceMark rm(THREAD);
|
||||
if (!ik->itable()->check_no_old_entries()) {
|
||||
tty->print_cr("klassItable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name());
|
||||
assert(false, "OLD method found");
|
||||
|
||||
// an itable should never contain old or obsolete methods
|
||||
if (ik->itable_length() > 0 &&
|
||||
!ik->itable()->check_no_old_or_obsolete_entries()) {
|
||||
if (RC_TRACE_ENABLED(0x00004000)) {
|
||||
RC_TRACE_WITH_THREAD(0x00004000, THREAD,
|
||||
("klassItable::check_no_old_or_obsolete_entries failure"
|
||||
" -- OLD or OBSOLETE method found -- class: %s",
|
||||
ik->signature_name()));
|
||||
ik->itable()->dump_itable();
|
||||
}
|
||||
no_old_methods = false;
|
||||
}
|
||||
// Check that the constant pool cache has no deleted entries.
|
||||
|
||||
// the constant pool cache should never contain old or obsolete methods
|
||||
if (ik->constants() != NULL &&
|
||||
ik->constants()->cache() != NULL &&
|
||||
!ik->constants()->cache()->check_no_old_entries()) {
|
||||
tty->print_cr("klassVtable::check_no_old_entries failure -- OLD method found -- class: %s", ik->signature_name());
|
||||
assert(false, "OLD method found");
|
||||
!ik->constants()->cache()->check_no_old_or_obsolete_entries()) {
|
||||
if (RC_TRACE_ENABLED(0x00004000)) {
|
||||
RC_TRACE_WITH_THREAD(0x00004000, THREAD,
|
||||
("cp-cache::check_no_old_or_obsolete_entries failure"
|
||||
" -- OLD or OBSOLETE method found -- class: %s",
|
||||
ik->signature_name()));
|
||||
ik->constants()->cache()->dump_cache();
|
||||
}
|
||||
no_old_methods = false;
|
||||
}
|
||||
|
||||
if (!no_old_methods) {
|
||||
if (RC_TRACE_ENABLED(0x00004000)) {
|
||||
dump_methods();
|
||||
} else {
|
||||
tty->print_cr("INFO: use the '-XX:TraceRedefineClasses=16384' option "
|
||||
"to see more info about the following guarantee() failure.");
|
||||
}
|
||||
guarantee(false, "OLD and/or OBSOLETE method(s) found");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void VM_RedefineClasses::dump_methods() {
|
||||
int j;
|
||||
tty->print_cr("_old_methods --");
|
||||
for (j = 0; j < _old_methods->length(); ++j) {
|
||||
Method* m = _old_methods->at(j);
|
||||
tty->print("%4d (%5d) ", j, m->vtable_index());
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
tty->print_cr("_new_methods --");
|
||||
for (j = 0; j < _new_methods->length(); ++j) {
|
||||
Method* m = _new_methods->at(j);
|
||||
tty->print("%4d (%5d) ", j, m->vtable_index());
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
tty->print_cr("_matching_(old/new)_methods --");
|
||||
for (j = 0; j < _matching_methods_length; ++j) {
|
||||
Method* m = _matching_old_methods[j];
|
||||
tty->print("%4d (%5d) ", j, m->vtable_index());
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
m = _matching_new_methods[j];
|
||||
tty->print(" (%5d) ", m->vtable_index());
|
||||
m->access_flags().print_on(tty);
|
||||
tty->cr();
|
||||
}
|
||||
tty->print_cr("_deleted_methods --");
|
||||
for (j = 0; j < _deleted_methods_length; ++j) {
|
||||
Method* m = _deleted_methods[j];
|
||||
tty->print("%4d (%5d) ", j, m->vtable_index());
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
tty->print_cr("_added_methods --");
|
||||
for (j = 0; j < _added_methods_length; ++j) {
|
||||
Method* m = _added_methods[j];
|
||||
tty->print("%4d (%5d) ", j, m->vtable_index());
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
int j;
|
||||
RC_TRACE(0x00004000, ("_old_methods --"));
|
||||
for (j = 0; j < _old_methods->length(); ++j) {
|
||||
Method* m = _old_methods->at(j);
|
||||
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index()));
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
RC_TRACE(0x00004000, ("_new_methods --"));
|
||||
for (j = 0; j < _new_methods->length(); ++j) {
|
||||
Method* m = _new_methods->at(j);
|
||||
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index()));
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
RC_TRACE(0x00004000, ("_matching_(old/new)_methods --"));
|
||||
for (j = 0; j < _matching_methods_length; ++j) {
|
||||
Method* m = _matching_old_methods[j];
|
||||
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index()));
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
m = _matching_new_methods[j];
|
||||
RC_TRACE_NO_CR(0x00004000, (" (%5d) ", m->vtable_index()));
|
||||
m->access_flags().print_on(tty);
|
||||
tty->cr();
|
||||
}
|
||||
RC_TRACE(0x00004000, ("_deleted_methods --"));
|
||||
for (j = 0; j < _deleted_methods_length; ++j) {
|
||||
Method* m = _deleted_methods[j];
|
||||
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index()));
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
RC_TRACE(0x00004000, ("_added_methods --"));
|
||||
for (j = 0; j < _added_methods_length; ++j) {
|
||||
Method* m = _added_methods[j];
|
||||
RC_TRACE_NO_CR(0x00004000, ("%4d (%5d) ", j, m->vtable_index()));
|
||||
m->access_flags().print_on(tty);
|
||||
tty->print(" -- ");
|
||||
m->print_name(tty);
|
||||
tty->cr();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue