Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/test/runtime/NMT/VirtualAllocTestType.java	Wed Aug 27 08:19:12 2014 -0400
     1.2 +++ b/test/runtime/NMT/VirtualAllocTestType.java	Wed Aug 27 08:35:03 2014 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -26,6 +26,7 @@
    1.11   * @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly
    1.12   * @key nmt jcmd
    1.13   * @library /testlibrary /testlibrary/whitebox
    1.14 + * @ignore
    1.15   * @build VirtualAllocTestType
    1.16   * @run main ClassFileInstaller sun.hotspot.WhiteBox
    1.17   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType
    1.18 @@ -54,7 +55,6 @@
    1.19      }
    1.20  
    1.21      addr = wb.NMTReserveMemory(reserveSize);
    1.22 -    mergeData();
    1.23      pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
    1.24  
    1.25      output = new OutputAnalyzer(pb.start());
    1.26 @@ -65,7 +65,6 @@
    1.27  
    1.28      wb.NMTCommitMemory(addr, commitSize);
    1.29  
    1.30 -    mergeData();
    1.31  
    1.32      output = new OutputAnalyzer(pb.start());
    1.33      output.shouldContain("Test (reserved=256KB, committed=128KB)");
    1.34 @@ -75,24 +74,15 @@
    1.35  
    1.36      wb.NMTUncommitMemory(addr, commitSize);
    1.37  
    1.38 -    mergeData();
    1.39  
    1.40      output = new OutputAnalyzer(pb.start());
    1.41      output.shouldContain("Test (reserved=256KB, committed=0KB)");
    1.42      output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed");
    1.43  
    1.44      wb.NMTReleaseMemory(addr, reserveSize);
    1.45 -    mergeData();
    1.46  
    1.47      output = new OutputAnalyzer(pb.start());
    1.48      output.shouldNotContain("Test (reserved=");
    1.49      output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved");
    1.50    }
    1.51 -
    1.52 -  public static void mergeData() throws Exception {
    1.53 -    // Use WB API to ensure that all data has been merged before we continue
    1.54 -    if (!wb.NMTWaitForDataMerge()) {
    1.55 -      throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
    1.56      }
    1.57 -  }
    1.58 -}