comparison src/share/vm/utilities/vmError.cpp @ 6152:958bb4b7be49

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents 2d503de963b3
children fd09f2d8283e
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
1 /* 1 /*
2 * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "compiler/compileBroker.hpp" 26 #include "compiler/compileBroker.hpp"
27 #include "gc_interface/collectedHeap.hpp" 27 #include "gc_interface/collectedHeap.hpp"
28 #include "prims/whitebox.hpp"
28 #include "runtime/arguments.hpp" 29 #include "runtime/arguments.hpp"
29 #include "runtime/frame.inline.hpp" 30 #include "runtime/frame.inline.hpp"
30 #include "runtime/init.hpp" 31 #include "runtime/init.hpp"
31 #include "runtime/os.hpp" 32 #include "runtime/os.hpp"
32 #include "runtime/thread.hpp" 33 #include "runtime/thread.hpp"
34 #include "runtime/vm_operations.hpp" 35 #include "runtime/vm_operations.hpp"
35 #include "utilities/debug.hpp" 36 #include "utilities/debug.hpp"
36 #include "utilities/decoder.hpp" 37 #include "utilities/decoder.hpp"
37 #include "utilities/defaultStream.hpp" 38 #include "utilities/defaultStream.hpp"
38 #include "utilities/errorReporter.hpp" 39 #include "utilities/errorReporter.hpp"
40 #include "utilities/events.hpp"
39 #include "utilities/top.hpp" 41 #include "utilities/top.hpp"
40 #include "utilities/vmError.hpp" 42 #include "utilities/vmError.hpp"
41 43
42 // List of environment variables that should be reported in error log file. 44 // List of environment variables that should be reported in error log file.
43 const char *env_list[] = { 45 const char *env_list[] = {
691 // print code cache information before vm abort 693 // print code cache information before vm abort
692 CodeCache::print_bounds(st); 694 CodeCache::print_bounds(st);
693 st->cr(); 695 st->cr();
694 } 696 }
695 697
696 STEP(200, "(printing dynamic libraries)" ) 698 STEP(200, "(printing ring buffers)" )
699
700 if (_verbose) {
701 Events::print_all(st);
702 st->cr();
703 }
704
705 STEP(205, "(printing dynamic libraries)" )
697 706
698 if (_verbose) { 707 if (_verbose) {
699 // dynamic libraries, or memory map 708 // dynamic libraries, or memory map
700 os::print_dll_info(st); 709 os::print_dll_info(st);
701 st->cr(); 710 st->cr();
704 STEP(210, "(printing VM options)" ) 713 STEP(210, "(printing VM options)" )
705 714
706 if (_verbose) { 715 if (_verbose) {
707 // VM options 716 // VM options
708 Arguments::print_on(st); 717 Arguments::print_on(st);
718 st->cr();
719 }
720
721 STEP(215, "(printing warning if internal testing API used)" )
722
723 if (WhiteBox::used()) {
724 st->print_cr("Unsupported internal testing APIs have been used.");
709 st->cr(); 725 st->cr();
710 } 726 }
711 727
712 STEP(220, "(printing environment variables)" ) 728 STEP(220, "(printing environment variables)" )
713 729