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

Merge
author zgu
date Thu, 19 Jul 2012 09:10:12 -0400
parents 7e5976e66c62 f1f45dddb0bd
children 4acebbe310e1
comparison
equal deleted inserted replaced
6231:7e5976e66c62 6233:d5bc62fcfac7
124 return "Native memory tracking is not enabled"; 124 return "Native memory tracking is not enabled";
125 case NMT_shutdown_user: 125 case NMT_shutdown_user:
126 return "Native memory tracking has been shutdown by user"; 126 return "Native memory tracking has been shutdown by user";
127 case NMT_normal: 127 case NMT_normal:
128 return "Native memory tracking has been shutdown due to process exiting"; 128 return "Native memory tracking has been shutdown due to process exiting";
129 case NMT_out_of_memory:
130 return "Native memory tracking has been shutdown due to out of native memory";
129 case NMT_initialization: 131 case NMT_initialization:
130 return "Native memory tracking failed to initialize"; 132 return "Native memory tracking failed to initialize";
131 case NMT_error_reporting: 133 case NMT_error_reporting:
132 return "Native memory tracking has been shutdown due to error reporting"; 134 return "Native memory tracking has been shutdown due to error reporting";
133 case NMT_out_of_generation: 135 case NMT_out_of_generation:
334 336
335 // a memory baseline of snapshot 337 // a memory baseline of snapshot
336 static MemBaseline _baseline; 338 static MemBaseline _baseline;
337 339
338 // query lock 340 // query lock
339 static Mutex _query_lock; 341 static Mutex* _query_lock;
340 342
341 // a thread can start to allocate memory before it is attached 343 // a thread can start to allocate memory before it is attached
342 // to VM 'Thread', those memory activities are recorded here. 344 // to VM 'Thread', those memory activities are recorded here.
343 // ThreadCritical is required to guard this global recorder. 345 // ThreadCritical is required to guard this global recorder.
344 static MemRecorder* _global_recorder; 346 static MemRecorder* _global_recorder;