comparison src/share/vm/runtime/java.cpp @ 7643:3ac7d10a6572

Merge with hsx25/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 31 Jan 2013 15:42:25 +0100
parents 291ffc492eb6 212c5b9c38e7
children 320d6fd3dbf3
comparison
equal deleted inserted replaced
7573:17b6a63fe7c2 7643:3ac7d10a6572
372 void print_statistics() { 372 void print_statistics() {
373 373
374 if (CITime) { 374 if (CITime) {
375 CompileBroker::print_times(); 375 CompileBroker::print_times();
376 } 376 }
377 if(PrintNMethodStatistics) { 377
378 nmethod::print_statistics(); 378 if (PrintCodeCache) {
379 } 379 MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
380 CodeCache::print();
381 }
382
380 #ifdef COMPILER2 383 #ifdef COMPILER2
381 if (PrintPreciseBiasedLockingStatistics) { 384 if (PrintPreciseBiasedLockingStatistics) {
382 OptoRuntime::print_named_counters(); 385 OptoRuntime::print_named_counters();
383 } 386 }
384 #endif 387 #endif
553 { MutexLocker ml(BeforeExit_lock); 556 { MutexLocker ml(BeforeExit_lock);
554 _before_exit_status = BEFORE_EXIT_DONE; 557 _before_exit_status = BEFORE_EXIT_DONE;
555 BeforeExit_lock->notify_all(); 558 BeforeExit_lock->notify_all();
556 } 559 }
557 560
561 // Shutdown NMT before exit. Otherwise,
562 // it will run into trouble when system destroys static variables.
563 MemTracker::shutdown(MemTracker::NMT_normal);
564
558 #undef BEFORE_EXIT_NOT_RUN 565 #undef BEFORE_EXIT_NOT_RUN
559 #undef BEFORE_EXIT_RUNNING 566 #undef BEFORE_EXIT_RUNNING
560 #undef BEFORE_EXIT_DONE 567 #undef BEFORE_EXIT_DONE
561 } 568 }
562 569