src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java

rev 60195 : webrev06

*** 167,198 ****
      private static void histo(String pid, String options)
          throws AttachNotSupportedException, IOException,
                 UnsupportedEncodingException {
          String liveopt = "-all";
          String filename = null;
          String subopts[] = options.split(",");
  
          for (int i = 0; i < subopts.length; i++) {
              String subopt = subopts[i];
              if (subopt.equals("") || subopt.equals("all")) {
!                 // pass
              } else if (subopt.equals("live")) {
                  liveopt = "-live";
              } else if (subopt.startsWith("file=")) {
                  filename = parseFileName(subopt);
                  if (filename == null) {
                      usage(1); // invalid options or no filename
                  }
              } else {
                  usage(1);
              }
          }
  
          System.out.flush();
- 
          // inspectHeap is not the same as jcmd GC.class_histogram
!         executeCommandForPid(pid, "inspectheap", liveopt, filename);
      }
  
      private static void dump(String pid, String options)
          throws AttachNotSupportedException, IOException,
                 UnsupportedEncodingException {
--- 167,211 ----
      private static void histo(String pid, String options)
          throws AttachNotSupportedException, IOException,
                 UnsupportedEncodingException {
          String liveopt = "-all";
          String filename = null;
+         String parallel = null;
          String subopts[] = options.split(",");
+         boolean set_all = false;
+         boolean set_live = false;
  
          for (int i = 0; i < subopts.length; i++) {
              String subopt = subopts[i];
              if (subopt.equals("") || subopt.equals("all")) {
!                 set_all = true;
!                 liveopt = "-all";
              } else if (subopt.equals("live")) {
+                 // Add '-' for compatibility.
+                 set_live = true;
                  liveopt = "-live";
              } else if (subopt.startsWith("file=")) {
                  filename = parseFileName(subopt);
                  if (filename == null) {
                      usage(1); // invalid options or no filename
                  }
+             } else if (subopt.startsWith("parallel=")) {
+                parallel = subopt.substring("parallel=".length());
+                if (parallel == null) {
+                     usage(1);
+                }
              } else {
                  usage(1);
              }
          }
+         if (set_live && set_all) {
+             usage(1);
+         }
  
          System.out.flush();
          // inspectHeap is not the same as jcmd GC.class_histogram
!         executeCommandForPid(pid, "inspectheap", liveopt, filename, parallel);
      }
  
      private static void dump(String pid, String options)
          throws AttachNotSupportedException, IOException,
                 UnsupportedEncodingException {
*** 285,294 ****
--- 298,311 ----
          System.err.println("");
          System.err.println("    histo-options:");
          System.err.println("      live         count only live objects");
          System.err.println("      all          count all objects in the heap (default if one of \"live\" or \"all\" is not specified)");
          System.err.println("      file=<file>  dump data to <file>");
+         System.err.println("      parallel=<number>  parallel threads number for heap iteration:");
+         System.err.println("                                  parallel=0 default behavior, use predefined number of threads");
+         System.err.println("                                  parallel=1 disable parallel heap iteration");
+         System.err.println("                                  parallel=<N> use N threads for parallel heap iteration");
          System.err.println("");
          System.err.println("    Example: jmap -histo:live,file=/tmp/histo.data <pid>");
          System.exit(exit);
      }
  }