1.1 --- a/src/share/vm/services/memTracker.cpp Wed Apr 24 09:00:04 2013 -0400
1.2 +++ b/src/share/vm/services/memTracker.cpp Wed Apr 24 14:55:04 2013 -0400
1.3 @@ -573,7 +573,7 @@
1.4
1.5 // baseline current memory snapshot
1.6 bool MemTracker::baseline() {
1.7 - MutexLockerEx lock(_query_lock, true);
1.8 + MutexLocker lock(_query_lock);
1.9 MemSnapshot* snapshot = get_snapshot();
1.10 if (snapshot != NULL) {
1.11 return _baseline.baseline(*snapshot, false);
1.12 @@ -584,7 +584,7 @@
1.13 // print memory usage from current snapshot
1.14 bool MemTracker::print_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
1.15 MemBaseline baseline;
1.16 - MutexLockerEx lock(_query_lock, true);
1.17 + MutexLocker lock(_query_lock);
1.18 MemSnapshot* snapshot = get_snapshot();
1.19 if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
1.20 BaselineReporter reporter(out, unit);
1.21 @@ -597,7 +597,7 @@
1.22 // Whitebox API for blocking until the current generation of NMT data has been merged
1.23 bool MemTracker::wbtest_wait_for_data_merge() {
1.24 // NMT can't be shutdown while we're holding _query_lock
1.25 - MutexLockerEx lock(_query_lock, true);
1.26 + MutexLocker lock(_query_lock);
1.27 assert(_worker_thread != NULL, "Invalid query");
1.28 // the generation at query time, so NMT will spin till this generation is processed
1.29 unsigned long generation_at_query_time = SequenceGenerator::current_generation();
1.30 @@ -641,7 +641,7 @@
1.31
1.32 // compare memory usage between current snapshot and baseline
1.33 bool MemTracker::compare_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
1.34 - MutexLockerEx lock(_query_lock, true);
1.35 + MutexLocker lock(_query_lock);
1.36 if (_baseline.baselined()) {
1.37 MemBaseline baseline;
1.38 MemSnapshot* snapshot = get_snapshot();
