8362276: NMT tests should have locks for the entire tests

Reviewed-by: shade, coleenp

Author: Gerard Ziemski

test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp

@@ -90,10 +90,8 @@ static void check_inner(const ReservedMemoryRegion& rmr, R* regions, size_t regi
 class VirtualMemoryTrackerTest {
 public:
   static void test_add_committed_region_adjacent() {
-
     size_t size  = 0x01000000;
     ReservedSpace rs = MemoryReserver::reserve(size, mtTest);
-    MemTracker::NmtVirtualMemoryLocker nvml;
 
     address addr = (address)rs.base();
 
@@ -104,8 +102,10 @@ class VirtualMemoryTrackerTest {
     NativeCallStack stack2(&frame2, 1);
 
     // Fetch the added RMR for the space
-    ReservedMemoryRegion rmr = VirtualMemoryTracker::Instance::tree()->find_reserved_region(addr);
     RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
+    MemTracker::NmtVirtualMemoryLocker nvml;
+
+    ReservedMemoryRegion rmr = rtree->find_reserved_region(addr);
 
     ASSERT_EQ(rmr.size(), size);
     ASSERT_EQ(rmr.base(), addr);
@@ -164,14 +164,15 @@ class VirtualMemoryTrackerTest {
     // Cleanup
     rtree->uncommit_region(addr, 3 * cs);
     ASSERT_EQ(rmr.committed_size(), 0u);
-  }
 
-  static void test_add_committed_region_adjacent_overlapping() {
-    RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
     rtree->tree().remove_all();
+  }
 
+  static void test_add_committed_region_adjacent_overlapping() {
     size_t size  = 0x01000000;
     ReservedSpace rs = MemoryReserver::reserve(size, mtTest);
+
+    RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
     MemTracker::NmtVirtualMemoryLocker nvml;
 
     address addr = (address)rs.base();
@@ -252,15 +253,15 @@ class VirtualMemoryTrackerTest {
                 {addr + 3 * cs, 2 * cs} };
       check(rmr, r);
     }
-  }
 
-  static void test_add_committed_region_overlapping() {
-    RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
     rtree->tree().remove_all();
+  }
 
+  static void test_add_committed_region_overlapping() {
     size_t size  = 0x01000000;
-
     ReservedSpace rs = MemoryReserver::reserve(size, mtTest);
+
+    RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
     MemTracker::NmtVirtualMemoryLocker nvml;
 
     address addr = (address)rs.base();
@@ -418,6 +419,8 @@ class VirtualMemoryTrackerTest {
                 {addr + 2 * cs, cs} };
       check(rmr, r);
     }
+
+    rtree->tree().remove_all();
   }
 
   static void test_add_committed_region() {
@@ -432,11 +435,10 @@ class VirtualMemoryTrackerTest {
   }
 
   static void test_remove_uncommitted_region() {
-    RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
-    rtree->tree().remove_all();
-
     size_t size  = 0x01000000;
     ReservedSpace rs = MemoryReserver::reserve(size, mtTest);
+
+    RegionsTree* rtree = VirtualMemoryTracker::Instance::tree();
     MemTracker::NmtVirtualMemoryLocker nvml;
 
     address addr = (address)rs.base();
@@ -558,6 +560,8 @@ class VirtualMemoryTrackerTest {
       rtree->uncommit_region(addr, 3 * cs);
       check_empty(rmr);
     }
+
+    rtree->tree().remove_all();
   }
 };
 
@@ -575,4 +579,4 @@ TEST_VM(NMT_VirtualMemoryTracker, remove_uncommitted_region) {
   } else {
     tty->print_cr("skipped.");
   }
-}
+}