Mercurial > hg > truffle

diff src/share/vm/services/memTracker.hpp @ 6233:d5bc62fcfac7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author zgu
date Thu, 19 Jul 2012 09:10:12 -0400
parents 7e5976e66c62 f1f45dddb0bd
children 4acebbe310e1
line wrap: on
line diff
--- a/src/share/vm/services/memTracker.hpp	Thu Jul 19 09:05:42 2012 -0400
+++ b/src/share/vm/services/memTracker.hpp	Thu Jul 19 09:10:12 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.