128 |
128 |
129 static void print_bug_submit_message(outputStream *out, Thread *thread) { |
129 static void print_bug_submit_message(outputStream *out, Thread *thread) { |
130 if (out == NULL) return; |
130 if (out == NULL) return; |
131 out->print_raw_cr("# If you would like to submit a bug report, please visit:"); |
131 out->print_raw_cr("# If you would like to submit a bug report, please visit:"); |
132 out->print_raw ("# "); |
132 out->print_raw ("# "); |
133 out->print_raw_cr(Arguments::java_vendor_url_bug()); |
133 const char *url = Arguments::java_vendor_url_bug(); |
|
134 if (url == NULL || *url == '\0') |
|
135 url = JDK_Version::runtime_vendor_vm_bug_url(); |
|
136 out->print_raw_cr(url); |
134 // If the crash is in native code, encourage user to submit a bug to the |
137 // If the crash is in native code, encourage user to submit a bug to the |
135 // provider of that code. |
138 // provider of that code. |
136 if (thread && thread->is_Java_thread() && |
139 if (thread && thread->is_Java_thread() && |
137 !thread->is_hidden_from_external_view()) { |
140 !thread->is_hidden_from_external_view()) { |
138 JavaThread* jt = (JavaThread*)thread; |
141 JavaThread* jt = (JavaThread*)thread; |
319 JDK_Version::current().to_string(buf, buflen); |
322 JDK_Version::current().to_string(buf, buflen); |
320 const char* runtime_name = JDK_Version::runtime_name() != NULL ? |
323 const char* runtime_name = JDK_Version::runtime_name() != NULL ? |
321 JDK_Version::runtime_name() : ""; |
324 JDK_Version::runtime_name() : ""; |
322 const char* runtime_version = JDK_Version::runtime_version() != NULL ? |
325 const char* runtime_version = JDK_Version::runtime_version() != NULL ? |
323 JDK_Version::runtime_version() : ""; |
326 JDK_Version::runtime_version() : ""; |
|
327 const char* vendor_version = JDK_Version::runtime_vendor_version() != NULL ? |
|
328 JDK_Version::runtime_vendor_version() : ""; |
324 const char* jdk_debug_level = VM_Version::printable_jdk_debug_level() != NULL ? |
329 const char* jdk_debug_level = VM_Version::printable_jdk_debug_level() != NULL ? |
325 VM_Version::printable_jdk_debug_level() : ""; |
330 VM_Version::printable_jdk_debug_level() : ""; |
326 |
331 |
327 st->print_cr("# JRE version: %s (%s) (%sbuild %s)", runtime_name, buf, |
332 st->print_cr("# JRE version: %s%s%s (%s) (%sbuild %s)", runtime_name, |
328 jdk_debug_level, runtime_version); |
333 (*vendor_version != '\0') ? " " : "", vendor_version, |
|
334 buf, jdk_debug_level, runtime_version); |
329 |
335 |
330 // This is the long version with some default settings added |
336 // This is the long version with some default settings added |
331 st->print_cr("# Java VM: %s (%s%s, %s%s%s%s%s, %s, %s)", |
337 st->print_cr("# Java VM: %s%s%s (%s%s, %s%s%s%s%s, %s, %s)", |
332 VM_Version::vm_name(), |
338 VM_Version::vm_name(), |
|
339 (*vendor_version != '\0') ? " " : "", vendor_version, |
333 jdk_debug_level, |
340 jdk_debug_level, |
334 VM_Version::vm_release(), |
341 VM_Version::vm_release(), |
335 VM_Version::vm_info_string(), |
342 VM_Version::vm_info_string(), |
336 TieredCompilation ? ", tiered" : "", |
343 TieredCompilation ? ", tiered" : "", |
337 #if INCLUDE_JVMCI |
344 #if INCLUDE_JVMCI |