archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Zhengyu Gu 2012-07-19 09:10:12 -04:00
commit a0930ac7cd
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/services/memTracker.hpp
View file

@ -126,6 +126,8 @@ class MemTracker : AllStatic {
return "Native memory tracking has been shutdown by user";
case NMT_normal:
return "Native memory tracking has been shutdown due to process exiting";
case NMT_out_of_memory:
return "Native memory tracking has been shutdown due to out of native memory";
case NMT_initialization:
return "Native memory tracking failed to initialize";
case NMT_error_reporting:
@ -336,7 +338,7 @@ class MemTracker : AllStatic {
static MemBaseline _baseline;
// query lock
static Mutex _query_lock;
static Mutex* _query_lock;
// a thread can start to allocate memory before it is attached
// to VM 'Thread', those memory activities are recorded here.