Mercurial > hg > graal-jvmci-8
diff src/share/vm/services/memTracker.hpp @ 6232:f1f45dddb0bd
7181986: NMT ON: Assertion failure when running jdi ExpiredRequestDeletionTest
Summary: Changed _query_lock to heap object from static object. Also fixed _query_lock and snapshot lock ranks, so they can participate deadlock detection.
Reviewed-by: coleenp, dholmes, kvn
author | zgu |
---|---|
date | Mon, 16 Jul 2012 14:10:34 -0400 |
parents | d2a62e0f25eb |
children | d5bc62fcfac7 |
line wrap: on
line diff
--- a/src/share/vm/services/memTracker.hpp Wed Jul 04 15:55:45 2012 -0400 +++ b/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.