Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/test/gc/arguments/TestUseCompressedOopsErgoTools.java	Wed Sep 18 00:08:00 2013 +0000
     1.2 +++ b/test/gc/arguments/TestUseCompressedOopsErgoTools.java	Wed Sep 18 10:02:19 2013 +0200
     1.3 @@ -42,10 +42,10 @@
     1.4  
     1.5  class TestUseCompressedOopsErgoTools {
     1.6  
     1.7 -  private static long getClassMetaspaceSize() {
     1.8 +  private static long getCompressedClassSpaceSize() {
     1.9      HotSpotDiagnosticMXBean diagnostic = ManagementFactoryHelper.getDiagnosticMXBean();
    1.10  
    1.11 -    VMOption option = diagnostic.getVMOption("ClassMetaspaceSize");
    1.12 +    VMOption option = diagnostic.getVMOption("CompressedClassSpaceSize");
    1.13      return Long.parseLong(option.getValue());
    1.14    }
    1.15  
    1.16 @@ -132,13 +132,13 @@
    1.17      checkUseCompressedOops(join(gcflags, "-XX:ObjectAlignmentInBytes=16"), maxHeapForCompressedOops - 1, true);
    1.18      checkUseCompressedOops(join(gcflags, "-XX:ObjectAlignmentInBytes=16"), maxHeapForCompressedOops + 1, false);
    1.19  
    1.20 -    // use a different ClassMetaspaceSize
    1.21 -    String classMetaspaceSizeArg = "-XX:ClassMetaspaceSize=" + 2 * getClassMetaspaceSize();
    1.22 -    maxHeapForCompressedOops = getMaxHeapForCompressedOops(join(gcflags, classMetaspaceSizeArg));
    1.23 +    // use a different CompressedClassSpaceSize
    1.24 +    String compressedClassSpaceSizeArg = "-XX:CompressedClassSpaceSize=" + 2 * getCompressedClassSpaceSize();
    1.25 +    maxHeapForCompressedOops = getMaxHeapForCompressedOops(join(gcflags, compressedClassSpaceSizeArg));
    1.26  
    1.27 -    checkUseCompressedOops(join(gcflags, classMetaspaceSizeArg), maxHeapForCompressedOops, true);
    1.28 -    checkUseCompressedOops(join(gcflags, classMetaspaceSizeArg), maxHeapForCompressedOops - 1, true);
    1.29 -    checkUseCompressedOops(join(gcflags, classMetaspaceSizeArg), maxHeapForCompressedOops + 1, false);
    1.30 +    checkUseCompressedOops(join(gcflags, compressedClassSpaceSizeArg), maxHeapForCompressedOops, true);
    1.31 +    checkUseCompressedOops(join(gcflags, compressedClassSpaceSizeArg), maxHeapForCompressedOops - 1, true);
    1.32 +    checkUseCompressedOops(join(gcflags, compressedClassSpaceSizeArg), maxHeapForCompressedOops + 1, false);
    1.33    }
    1.34  
    1.35    private static void checkUseCompressedOops(String[] args, long heapsize, boolean expectUseCompressedOops) throws Exception {
    1.36 @@ -152,9 +152,7 @@
    1.37  
    1.38       boolean actualUseCompressedOops = getFlagBoolValue(" UseCompressedOops", output);
    1.39  
    1.40 -     if (expectUseCompressedOops != actualUseCompressedOops) {
    1.41 -       throw new RuntimeException("Expected use of compressed oops: " + expectUseCompressedOops + " but was: " + actualUseCompressedOops);
    1.42 -     }
    1.43 +     Asserts.assertEQ(expectUseCompressedOops, actualUseCompressedOops);
    1.44    }
    1.45  
    1.46    private static boolean getFlagBoolValue(String flag, String where) {
    1.47 @@ -162,7 +160,7 @@
    1.48      if (!m.find()) {
    1.49        throw new RuntimeException("Could not find value for flag " + flag + " in output string");
    1.50      }
    1.51 -    String match = m.group(1).equals("true");
    1.52 +    return m.group(1).equals("true");
    1.53    }
    1.54  
    1.55    private static String expect(String[] flags, boolean hasWarning, boolean hasError, int errorcode) throws Exception {