src/hotspot/share/memory/virtualspace.cpp

rev 52365 : [mq]: 8213058
rev 52366 : [mq]: 8213058-2

@@ -1057,18 +1057,10 @@
 
 /////////////// Unit tests ///////////////
 
 #ifndef PRODUCT
 
-#define test_log(...) \
-  do {\
-    if (VerboseInternalVMTests) { \
-      tty->print_cr(__VA_ARGS__); \
-      tty->flush(); \
-    }\
-  } while (false)
-
 class TestReservedSpace : AllStatic {
  public:
   static void small_page_write(void* addr, size_t size) {
     size_t page_size = os::vm_page_size();
 

@@ -1085,21 +1077,17 @@
       guarantee(os::release_memory(rs.base(), rs.size()), "Shouldn't fail");
     }
   }
 
   static void test_reserved_space1(size_t size, size_t alignment) {
-    test_log("test_reserved_space1(%p)", (void*) (uintptr_t) size);
-
     assert(is_aligned(size, alignment), "Incorrect input parameters");
 
     ReservedSpace rs(size,          // size
                      alignment,     // alignment
                      UseLargePages, // large
                      (char *)NULL); // requested_address
 
-    test_log(" rs.special() == %d", rs.special());
-
     assert(rs.base() != NULL, "Must be");
     assert(rs.size() == size, "Must be");
 
     assert(is_aligned(rs.base(), alignment), "aligned sizes should always give aligned addresses");
     assert(is_aligned(rs.size(), alignment), "aligned sizes should always give aligned addresses");

@@ -1110,18 +1098,14 @@
 
     release_memory_for_test(rs);
   }
 
   static void test_reserved_space2(size_t size) {
-    test_log("test_reserved_space2(%p)", (void*)(uintptr_t)size);
-
     assert(is_aligned(size, os::vm_allocation_granularity()), "Must be at least AG aligned");
 
     ReservedSpace rs(size);
 
-    test_log(" rs.special() == %d", rs.special());
-
     assert(rs.base() != NULL, "Must be");
     assert(rs.size() == size, "Must be");
 
     if (rs.special()) {
       small_page_write(rs.base(), size);

@@ -1129,13 +1113,10 @@
 
     release_memory_for_test(rs);
   }
 
   static void test_reserved_space3(size_t size, size_t alignment, bool maybe_large) {
-    test_log("test_reserved_space3(%p, %p, %d)",
-        (void*)(uintptr_t)size, (void*)(uintptr_t)alignment, maybe_large);
-
     if (size < alignment) {
       // Tests might set -XX:LargePageSizeInBytes=<small pages> and cause unexpected input arguments for this test.
       assert((size_t)os::vm_page_size() == os::large_page_size(), "Test needs further refinement");
       return;
     }

@@ -1145,12 +1126,10 @@
 
     bool large = maybe_large && UseLargePages && size >= os::large_page_size();
 
     ReservedSpace rs(size, alignment, large, false);
 
-    test_log(" rs.special() == %d", rs.special());
-
     assert(rs.base() != NULL, "Must be");
     assert(rs.size() == size, "Must be");
 
     if (rs.special()) {
       small_page_write(rs.base(), size);