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

     1.1 --- a/test/runtime/NMT/ThreadedVirtualAllocTestType.java	Wed Aug 27 08:19:12 2014 -0400
     1.2 +++ b/test/runtime/NMT/ThreadedVirtualAllocTestType.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   * @key nmt jcmd
    1.12   * @library /testlibrary /testlibrary/whitebox
    1.13   * @build ThreadedVirtualAllocTestType
    1.14 + * @ignore
    1.15   * @run main ClassFileInstaller sun.hotspot.WhiteBox
    1.16   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
    1.17   */
    1.18 @@ -60,8 +61,6 @@
    1.19      reserveThread.start();
    1.20      reserveThread.join();
    1.21  
    1.22 -    mergeData();
    1.23 -
    1.24      pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "detail"});
    1.25      output = new OutputAnalyzer(pb.start());
    1.26      output.shouldContain("Test (reserved=512KB, committed=0KB)");
    1.27 @@ -77,8 +76,6 @@
    1.28      commitThread.start();
    1.29      commitThread.join();
    1.30  
    1.31 -    mergeData();
    1.32 -
    1.33      output = new OutputAnalyzer(pb.start());
    1.34      output.shouldContain("Test (reserved=512KB, committed=128KB)");
    1.35      if (has_nmt_detail) {
    1.36 @@ -93,8 +90,6 @@
    1.37      uncommitThread.start();
    1.38      uncommitThread.join();
    1.39  
    1.40 -    mergeData();
    1.41 -
    1.42      output = new OutputAnalyzer(pb.start());
    1.43      output.shouldContain("Test (reserved=512KB, committed=0KB)");
    1.44      output.shouldNotMatch("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + commitSize) + "\\] committed");
    1.45 @@ -107,17 +102,9 @@
    1.46      releaseThread.start();
    1.47      releaseThread.join();
    1.48  
    1.49 -    mergeData();
    1.50 -
    1.51      output = new OutputAnalyzer(pb.start());
    1.52      output.shouldNotContain("Test (reserved=");
    1.53      output.shouldNotContain("\\[0x[0]*" + Long.toHexString(addr) + " - 0x[0]*" + Long.toHexString(addr + reserveSize) + "\\] reserved");
    1.54    }
    1.55  
    1.56 -  public static void mergeData() throws Exception {
    1.57 -    // Use WB API to ensure that all data has been merged before we continue
    1.58 -    if (!wb.NMTWaitForDataMerge()) {
    1.59 -      throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
    1.60      }
    1.61 -  }
    1.62 -}