--- a/hotspot/src/share/vm/prims/jvm.cpp Wed Jul 05 21:42:16 2017 +0200
+++ b/hotspot/src/share/vm/prims/jvm.cpp Sat May 14 15:34:30 2016 -0700
@@ -210,9 +210,9 @@
const char * to = to_class->external_name();
// print in a single call to reduce interleaving between threads
if (source_file != NULL) {
- log_debug(classresolve)("%s %s %s:%d (%s)", from, to, source_file, line_number, trace);
+ log_debug(class, resolve)("%s %s %s:%d (%s)", from, to, source_file, line_number, trace);
} else {
- log_debug(classresolve)("%s %s (%s)", from, to, trace);
+ log_debug(class, resolve)("%s %s (%s)", from, to, trace);
}
}
}
@@ -389,7 +389,7 @@
PUTPROP(props, "sun.nio.MaxDirectMemorySize", "-1");
} else {
char as_chars[256];
- jio_snprintf(as_chars, sizeof(as_chars), SIZE_FORMAT, MaxDirectMemorySize);
+ jio_snprintf(as_chars, sizeof(as_chars), JULONG_FORMAT, MaxDirectMemorySize);
PUTPROP(props, "sun.nio.MaxDirectMemorySize", as_chars);
}
}
@@ -805,7 +805,7 @@
return NULL;
}
- if (log_is_enabled(Debug, classresolve)) {
+ if (log_is_enabled(Debug, class, resolve)) {
trace_class_resolution(k);
}
return (jclass) JNIHandles::make_local(env, k->java_mirror());
@@ -842,7 +842,7 @@
jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
h_prot, false, THREAD);
- if (log_is_enabled(Debug, classresolve) && result != NULL) {
+ if (log_is_enabled(Debug, class, resolve) && result != NULL) {
trace_class_resolution(java_lang_Class::as_Klass(JNIHandles::resolve_non_null(result)));
}
return result;
@@ -872,7 +872,7 @@
jclass result = find_class_from_class_loader(env, h_name, init, h_loader,
h_prot, true, thread);
- if (log_is_enabled(Debug, classresolve) && result != NULL) {
+ if (log_is_enabled(Debug, class, resolve) && result != NULL) {
// this function is generally only used for class loading during verification.
ResourceMark rm;
oop from_mirror = JNIHandles::resolve_non_null(from);
@@ -882,7 +882,7 @@
oop mirror = JNIHandles::resolve_non_null(result);
Klass* to_class = java_lang_Class::as_Klass(mirror);
const char * to = to_class->external_name();
- log_debug(classresolve)("%s %s (verification)", from_name, to);
+ log_debug(class, resolve)("%s %s (verification)", from_name, to);
}
return result;
@@ -950,7 +950,7 @@
&st,
CHECK_NULL);
- if (log_is_enabled(Debug, classresolve) && k != NULL) {
+ if (log_is_enabled(Debug, class, resolve) && k != NULL) {
trace_class_resolution(k);
}