Mercurial > hg > truffle
changeset 7586:90a92d5bca17
Merge
author | zgu |
---|---|
date | Fri, 11 Jan 2013 09:53:24 -0800 |
parents | e0cf9af8978e (diff) c1c8479222cd (current diff) |
children | 4a916f2ce331 f9eb431c3efe |
files | |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/java.cpp Thu Jan 10 21:00:11 2013 -0500 +++ b/src/share/vm/runtime/java.cpp Fri Jan 11 09:53:24 2013 -0800 @@ -542,6 +542,10 @@ BeforeExit_lock->notify_all(); } + // Shutdown NMT before exit. Otherwise, + // it will run into trouble when system destroys static variables. + MemTracker::shutdown(MemTracker::NMT_normal); + #undef BEFORE_EXIT_NOT_RUN #undef BEFORE_EXIT_RUNNING #undef BEFORE_EXIT_DONE
--- a/src/share/vm/runtime/thread.cpp Thu Jan 10 21:00:11 2013 -0500 +++ b/src/share/vm/runtime/thread.cpp Fri Jan 11 09:53:24 2013 -0800 @@ -4011,10 +4011,6 @@ Mutex::_as_suspend_equivalent_flag); } - // Shutdown NMT before exit. Otherwise, - // it will run into trouble when system destroys static variables. - MemTracker::shutdown(MemTracker::NMT_normal); - // Hang forever on exit if we are reporting an error. if (ShowMessageBoxOnError && is_error_reported()) { os::infinite_sleep();