Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/java.cpp @ 7596:212c5b9c38e7
Merge
author | dlong |
---|---|
date | Thu, 17 Jan 2013 01:27:02 -0500 |
parents | 9deda4d8e126 e0cf9af8978e |
children | 3ac7d10a6572 db9981fd3124 |
comparison
equal
deleted
inserted
replaced
7595:9deda4d8e126 | 7596:212c5b9c38e7 |
---|---|
546 { MutexLocker ml(BeforeExit_lock); | 546 { MutexLocker ml(BeforeExit_lock); |
547 _before_exit_status = BEFORE_EXIT_DONE; | 547 _before_exit_status = BEFORE_EXIT_DONE; |
548 BeforeExit_lock->notify_all(); | 548 BeforeExit_lock->notify_all(); |
549 } | 549 } |
550 | 550 |
551 // Shutdown NMT before exit. Otherwise, | |
552 // it will run into trouble when system destroys static variables. | |
553 MemTracker::shutdown(MemTracker::NMT_normal); | |
554 | |
551 #undef BEFORE_EXIT_NOT_RUN | 555 #undef BEFORE_EXIT_NOT_RUN |
552 #undef BEFORE_EXIT_RUNNING | 556 #undef BEFORE_EXIT_RUNNING |
553 #undef BEFORE_EXIT_DONE | 557 #undef BEFORE_EXIT_DONE |
554 } | 558 } |
555 | 559 |