comparison src/share/vm/runtime/java.cpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents 6b0fd0964b87
children cefad50507d8
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
43 #include "oops/method.hpp" 43 #include "oops/method.hpp"
44 #include "oops/objArrayOop.hpp" 44 #include "oops/objArrayOop.hpp"
45 #include "oops/oop.inline.hpp" 45 #include "oops/oop.inline.hpp"
46 #include "oops/symbol.hpp" 46 #include "oops/symbol.hpp"
47 #include "prims/jvmtiExport.hpp" 47 #include "prims/jvmtiExport.hpp"
48 #include "runtime/aprofiler.hpp"
49 #include "runtime/arguments.hpp" 48 #include "runtime/arguments.hpp"
50 #include "runtime/biasedLocking.hpp" 49 #include "runtime/biasedLocking.hpp"
51 #include "runtime/compilationPolicy.hpp" 50 #include "runtime/compilationPolicy.hpp"
52 #include "runtime/fprofiler.hpp" 51 #include "runtime/fprofiler.hpp"
53 #include "runtime/init.hpp" 52 #include "runtime/init.hpp"
519 if (Verbose) { 518 if (Verbose) {
520 ClassLoaderDataGraph::dump_on(gclog_or_tty); 519 ClassLoaderDataGraph::dump_on(gclog_or_tty);
521 } 520 }
522 } 521 }
523 522
524
525 if (Arguments::has_alloc_profile()) {
526 HandleMark hm;
527 // Do one last collection to enumerate all the objects
528 // allocated since the last one.
529 Universe::heap()->collect(GCCause::_allocation_profiler);
530 AllocationProfiler::disengage();
531 AllocationProfiler::print(0);
532 }
533
534 if (PrintBytecodeHistogram) { 523 if (PrintBytecodeHistogram) {
535 BytecodeHistogram::print(); 524 BytecodeHistogram::print();
536 } 525 }
537 526
538 if (JvmtiExport::should_post_thread_life()) { 527 if (JvmtiExport::should_post_thread_life()) {