--- a/hotspot/src/share/vm/services/memTracker.hpp Wed Jul 04 15:55:45 2012 -0400
+++ b/hotspot/src/share/vm/services/memTracker.hpp Mon Jul 16 14:10:34 2012 -0400
@@ -126,6 +126,8 @@
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 @@
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.