Mercurial > hg > graal-jvmci-8

comparison src/share/vm/utilities/vmError.cpp @ 23660:b5f3a471e646

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents dd9cc155639c 59eb74ac51f2
children
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
228 char signame_buf[64]; 228 char signame_buf[64];
229 const char *signame = os::exception_name(_id, signame_buf, sizeof(signame_buf)); 229 const char *signame = os::exception_name(_id, signame_buf, sizeof(signame_buf));
230 230
231 if (signame) { 231 if (signame) {
232 jio_snprintf(buf, buflen, 232 jio_snprintf(buf, buflen,
233 "%s (0x%x) at pc=" PTR_FORMAT ", pid=%d, tid=" UINTX_FORMAT, 233 "%s (0x%x) at pc=" PTR_FORMAT ", pid=%d, tid=" INTPTR_FORMAT,
234 signame, _id, _pc, 234 signame, _id, _pc,
235 os::current_process_id(), os::current_thread_id()); 235 os::current_process_id(), os::current_thread_id());
236 } else if (_filename != NULL && _lineno > 0) { 236 } else if (_filename != NULL && _lineno > 0) {
237 // skip directory names 237 // skip directory names
238 char separator = os::file_separator()[0]; 238 char separator = os::file_separator()[0];
239 const char *p = strrchr(_filename, separator); 239 const char *p = strrchr(_filename, separator);
240 int n = jio_snprintf(buf, buflen, 240 int n = jio_snprintf(buf, buflen,
241 "Internal Error at %s:%d, pid=%d, tid=" UINTX_FORMAT, 241 "Internal Error at %s:%d, pid=%d, tid=" INTPTR_FORMAT,
242 p ? p + 1 : _filename, _lineno, 242 p ? p + 1 : _filename, _lineno,
243 os::current_process_id(), os::current_thread_id()); 243 os::current_process_id(), os::current_thread_id());
244 if (n >= 0 && n < buflen && _message) { 244 if (n >= 0 && n < buflen && _message) {
245 if (_detail_msg) { 245 if (_detail_msg) {
246 jio_snprintf(buf + n, buflen - n, "%s%s: %s", 246 jio_snprintf(buf + n, buflen - n, "%s%s: %s",
250 os::line_separator(), _message); 250 os::line_separator(), _message);
251 } 251 }
252 } 252 }
253 } else { 253 } else {
254 jio_snprintf(buf, buflen, 254 jio_snprintf(buf, buflen,
255 "Internal Error (0x%x), pid=%d, tid=" UINTX_FORMAT, 255 "Internal Error (0x%x), pid=%d, tid=" INTPTR_FORMAT,
256 _id, os::current_process_id(), os::current_thread_id()); 256 _id, os::current_process_id(), os::current_thread_id());
257 } 257 }
258 258
259 return buf; 259 return buf;
260 } 260 }
437 437
438 STEP(30, "(printing current thread and pid)") 438 STEP(30, "(printing current thread and pid)")
439 439
440 // process id, thread id 440 // process id, thread id
441 st->print(", pid=%d", os::current_process_id()); 441 st->print(", pid=%d", os::current_process_id());
442 st->print(", tid=" UINTX_FORMAT, os::current_thread_id()); 442 st->print(", tid=" INTPTR_FORMAT, os::current_thread_id());
443 st->cr(); 443 st->cr();
444 444
445 STEP(40, "(printing error message)") 445 STEP(40, "(printing error message)")
446 446
447 if (should_report_bug(_id)) { // already printed the message. 447 if (should_report_bug(_id)) { // already printed the message.