Mercurial > hg > graal-jvmci-8
diff src/share/vm/services/memTracker.cpp @ 20364:c6211b707068
8055007: NMT2: emptyStack missing in minimal build
Summary: Refactored emptyStack to a static member of NativeCallStack, which is accessible in minimal build.
Reviewed-by: coleenp, dholmes
| author | zgu |
|---|---|
| date | Tue, 19 Aug 2014 08:34:25 -0400 |
| parents | 36c9011aaead |
| children | 417e3b8d04c5 |
line wrap: on
line diff
--- a/src/share/vm/services/memTracker.cpp Thu Aug 14 09:02:51 2014 -0400 +++ b/src/share/vm/services/memTracker.cpp Tue Aug 19 08:34:25 2014 -0400 @@ -39,8 +39,6 @@ volatile NMT_TrackingLevel MemTracker::_tracking_level = NMT_unknown; NMT_TrackingLevel MemTracker::_cmdline_tracking_level = NMT_unknown; -NativeCallStack emptyStack(0, false); - MemBaseline MemTracker::_baseline; Mutex* MemTracker::_query_lock = NULL; bool MemTracker::_is_nmt_env_valid = true; @@ -69,6 +67,10 @@ os::unsetenv(buf); } + // Construct NativeCallStack::EMPTY_STACK. It may get constructed twice, + // but it is benign, the results are the same. + ::new ((void*)&NativeCallStack::EMPTY_STACK) NativeCallStack(0, false); + if (!MallocTracker::initialize(level) || !VirtualMemoryTracker::initialize(level)) { level = NMT_off;