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

Merge

Browse Source
This commit is contained in:
Daniel D. Daugherty 2015-04-16 17:57:18 +00:00
commit 61f27a0290
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotspot/src/share/vm/utilities/vmError.cpp
View File

@ -231,7 +231,7 @@ char* VMError::error_string(char* buf, int buflen) {
if (signame) { if (signame) {
jio_snprintf(buf, buflen, jio_snprintf(buf, buflen,
"%s (0x%x) at pc=" PTR_FORMAT ", pid=%d, tid=" UINTX_FORMAT, "%s (0x%x) at pc=" PTR_FORMAT ", pid=%d, tid=" INTPTR_FORMAT,
signame, _id, _pc, signame, _id, _pc,
os::current_process_id(), os::current_thread_id()); os::current_process_id(), os::current_thread_id());
} else if (_filename != NULL && _lineno > 0) { } else if (_filename != NULL && _lineno > 0) {
@ -239,7 +239,7 @@ char* VMError::error_string(char* buf, int buflen) {
char separator = os::file_separator()[0]; char separator = os::file_separator()[0];
const char *p = strrchr(_filename, separator); const char *p = strrchr(_filename, separator);
int n = jio_snprintf(buf, buflen, int n = jio_snprintf(buf, buflen,
"Internal Error at %s:%d, pid=%d, tid=" UINTX_FORMAT, "Internal Error at %s:%d, pid=%d, tid=" INTPTR_FORMAT,
p ? p + 1 : _filename, _lineno, p ? p + 1 : _filename, _lineno,
os::current_process_id(), os::current_thread_id()); os::current_process_id(), os::current_thread_id());
if (n >= 0 && n < buflen && _message) { if (n >= 0 && n < buflen && _message) {
@ -253,7 +253,7 @@ char* VMError::error_string(char* buf, int buflen) {
} }
} else { } else {
jio_snprintf(buf, buflen, jio_snprintf(buf, buflen,
"Internal Error (0x%x), pid=%d, tid=" UINTX_FORMAT, "Internal Error (0x%x), pid=%d, tid=" INTPTR_FORMAT,
_id, os::current_process_id(), os::current_thread_id()); _id, os::current_process_id(), os::current_thread_id());
} }
@ -480,7 +480,7 @@ void VMError::report(outputStream* st) {
// process id, thread id // process id, thread id
st->print(", pid=%d", os::current_process_id()); st->print(", pid=%d", os::current_process_id());
st->print(", tid=" UINTX_FORMAT, os::current_thread_id()); st->print(", tid=" INTPTR_FORMAT, os::current_thread_id());
st->cr(); st->cr();
STEP(40, "(printing error message)") STEP(40, "(printing error message)")