test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java

*** 25,34 ****
--- 25,35 ----
  
  import java.io.BufferedReader;
  import java.io.IOException;
  import java.io.InputStreamReader;
  import java.io.Reader;
+ import java.math.BigDecimal;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  import java.util.LinkedHashMap;
  import java.util.Map;
*** 47,56 ****
--- 48,59 ----
      private static final StringBuilder finalFailedMessage = new StringBuilder();
  
      /* Used to start the JVM with the same type as current */
      static String VMType;
  
+     private static Map<String, JVMOption> optionsAsMap;
+ 
      static {
          if (Platform.isServer()) {
              VMType = "-server";
          } else if (Platform.isClient()) {
              VMType = "-client";
*** 61,70 ****
--- 64,151 ----
          } else {
              VMType = null;
          }
      }
  
+     public static boolean fitsRange(String optionName, BigDecimal number) throws Exception {
+         JVMOption option;
+         String minRangeString = null;
+         String maxRangeString = null;
+         boolean fits = true;
+ 
+         if (optionsAsMap == null) {
+             optionsAsMap = getOptionsWithRangeAsMap();
+         }
+ 
+         option = optionsAsMap.get(optionName);
+         if (option != null) {
+             minRangeString = option.getMin();
+             if (minRangeString != null) {
+                 fits = (number.compareTo(new BigDecimal(minRangeString)) >= 0);
+             }
+             maxRangeString = option.getMax();
+             if (maxRangeString != null) {
+                 fits &= (number.compareTo(new BigDecimal(maxRangeString)) <= 0);
+             }
+         }
+ 
+         return fits;
+     }
+ 
+     public static boolean fitsRange(String optionName, String number) throws Exception {
+         String lowerCase = number.toLowerCase();
+         String multiplier = "1";
+         if (lowerCase.endsWith("k")) {
+             multiplier = "1024";
+             lowerCase = lowerCase.substring(0, lowerCase.length()-1);
+         } else if (lowerCase.endsWith("m")) {
+             multiplier = "1048576"; //1024*1024
+             lowerCase = lowerCase.substring(0, lowerCase.length()-1);
+         } else if (lowerCase.endsWith("g")) {
+             multiplier = "1073741824"; //1024*1024*1024
+             lowerCase = lowerCase.substring(0, lowerCase.length()-1);
+         } else if (lowerCase.endsWith("t")) {
+             multiplier = "1099511627776"; //1024*1024*1024*1024
+             lowerCase = lowerCase.substring(0, lowerCase.length()-1);
+         }
+         BigDecimal valueBig = new BigDecimal(lowerCase);
+         BigDecimal multiplierBig = new BigDecimal(multiplier);
+         return fitsRange(optionName, valueBig.multiply(multiplierBig));
+     }
+ 
+     public static String getMinOptionRange(String optionName) throws Exception {
+         JVMOption option;
+         String minRange = null;
+ 
+         if (optionsAsMap == null) {
+             optionsAsMap = getOptionsWithRangeAsMap();
+         }
+ 
+         option = optionsAsMap.get(optionName);
+         if (option != null) {
+             minRange = option.getMin();
+         }
+ 
+         return minRange;
+     }
+ 
+     public static String getMaxOptionRange(String optionName) throws Exception {
+         JVMOption option;
+         String maxRange = null;
+ 
+         if (optionsAsMap == null) {
+             optionsAsMap = getOptionsWithRangeAsMap();
+         }
+ 
+         option = optionsAsMap.get(optionName);
+         if (option != null) {
+             maxRange = option.getMax();
+         }
+ 
+         return maxRange;
+     }
+ 
      /**
       * Add dependency for option depending on it's name. E.g. enable G1 GC for
       * G1 options or add prepend options to not hit constraints.
       *
       * @param option option
*** 78,87 ****
--- 159,175 ----
  
          if (name.startsWith("CMS")) {
              option.addPrepend("-XX:+UseConcMarkSweepGC");
          }
  
+         if (name.startsWith("Shared")) {
+             option.addPrepend("-XX:+UnlockDiagnosticVMOptions");
+             String fileName = "Test" + name + ".jsa";
+             option.addPrepend("-XX:SharedArchiveFile=" + fileName);
+             option.addPrepend("-Xshare:dump");
+         }
+ 
          switch (name) {
              case "MinHeapFreeRatio":
                  option.addPrepend("-XX:MaxHeapFreeRatio=100");
                  break;
              case "MaxHeapFreeRatio":
*** 110,120 ****
                  break;
              default:
                  /* Do nothing */
                  break;
          }
- 
      }
  
      /**
       * Parse JVM Options. Get input from "inputReader". Parse using
       * "-XX:+PrintFlagsRanges" output format.
--- 198,207 ----