src/share/vm/services/memTracker.cpp

*** 52,62 ****
  
  
  MemRecorder*                    MemTracker::_global_recorder = NULL;
  MemSnapshot*                    MemTracker::_snapshot = NULL;
  MemBaseline                     MemTracker::_baseline;
! Mutex                           MemTracker::_query_lock(Monitor::native, "NMT_queryLock");
  volatile MemRecorder*           MemTracker::_merge_pending_queue = NULL;
  volatile MemRecorder*           MemTracker::_pooled_recorders = NULL;
  MemTrackWorker*                 MemTracker::_worker_thread = NULL;
  int                             MemTracker::_sync_point_skip_count = 0;
  MemTracker::NMTLevel            MemTracker::_tracking_level = MemTracker::NMT_off;
--- 52,62 ----
  
  
  MemRecorder*                    MemTracker::_global_recorder = NULL;
  MemSnapshot*                    MemTracker::_snapshot = NULL;
  MemBaseline                     MemTracker::_baseline;
! Mutex*                          MemTracker::_query_lock = NULL;
  volatile MemRecorder*           MemTracker::_merge_pending_queue = NULL;
  volatile MemRecorder*           MemTracker::_pooled_recorders = NULL;
  MemTrackWorker*                 MemTracker::_worker_thread = NULL;
  int                             MemTracker::_sync_point_skip_count = 0;
  MemTracker::NMTLevel            MemTracker::_tracking_level = MemTracker::NMT_off;
*** 87,96 ****
--- 87,102 ----
      if (UseMallocOnly) {
        shutdown(NMT_use_malloc_only);
        return;
      }
  
+     _query_lock = new (std::nothrow) Mutex(Monitor::max_nonleaf, "NMT_queryLock");
+     if (_query_lock == NULL) {
+       shutdown(NMT_out_of_memory);
+       return;
+     }
+ 
      debug_only(_main_thread_tid = os::current_thread_id();)
      _state = NMT_bootstrapping_single_thread;
      NMT_track_callsite = (_tracking_level == NMT_detail && can_walk_stack());
    }
  }
*** 162,172 ****
    delete_all_pooled_recorders();
  
    {
      // shared baseline and snapshot are the only objects needed to
      // create query results
!     MutexLockerEx locker(&_query_lock, true);
      // cleanup baseline data and snapshot
      _baseline.clear();
      delete _snapshot;
      _snapshot = NULL;
    }
--- 168,178 ----
    delete_all_pooled_recorders();
  
    {
      // shared baseline and snapshot are the only objects needed to
      // create query results
!     MutexLockerEx locker(_query_lock, true);
      // cleanup baseline data and snapshot
      _baseline.clear();
      delete _snapshot;
      _snapshot = NULL;
    }
*** 532,542 ****
    }
  }
  
  // baseline current memory snapshot
  bool MemTracker::baseline() {
!   MutexLockerEx lock(&_query_lock, true);
    MemSnapshot* snapshot = get_snapshot();
    if (snapshot != NULL) {
      return _baseline.baseline(*snapshot, false);
    }
    return false;
--- 538,548 ----
    }
  }
  
  // baseline current memory snapshot
  bool MemTracker::baseline() {
!   MutexLockerEx lock(_query_lock, true);
    MemSnapshot* snapshot = get_snapshot();
    if (snapshot != NULL) {
      return _baseline.baseline(*snapshot, false);
    }
    return false;
*** 543,553 ****
  }
  
  // print memory usage from current snapshot
  bool MemTracker::print_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
    MemBaseline  baseline;
!   MutexLockerEx lock(&_query_lock, true);
    MemSnapshot* snapshot = get_snapshot();
    if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
      BaselineReporter reporter(out, unit);
      reporter.report_baseline(baseline, summary_only);
      return true;
--- 549,559 ----
  }
  
  // print memory usage from current snapshot
  bool MemTracker::print_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
    MemBaseline  baseline;
!   MutexLockerEx lock(_query_lock, true);
    MemSnapshot* snapshot = get_snapshot();
    if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
      BaselineReporter reporter(out, unit);
      reporter.report_baseline(baseline, summary_only);
      return true;
*** 555,565 ****
    return false;
  }
  
  // compare memory usage between current snapshot and baseline
  bool MemTracker::compare_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
!   MutexLockerEx lock(&_query_lock, true);
    if (_baseline.baselined()) {
      MemBaseline baseline;
      MemSnapshot* snapshot = get_snapshot();
      if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
        BaselineReporter reporter(out, unit);
--- 561,571 ----
    return false;
  }
  
  // compare memory usage between current snapshot and baseline
  bool MemTracker::compare_memory_usage(BaselineOutputer& out, size_t unit, bool summary_only) {
!   MutexLockerEx lock(_query_lock, true);
    if (_baseline.baselined()) {
      MemBaseline baseline;
      MemSnapshot* snapshot = get_snapshot();
      if (snapshot != NULL && baseline.baseline(*snapshot, summary_only)) {
        BaselineReporter reporter(out, unit);