src/share/vm/runtime/arguments.cpp

rev 4560 : 8006088: Incompatible heap size flags accepted by VM
Summary: Make processing of minimum, initial and maximum heap size more intiutive by removing previous limitations on allowed values, and make error reporting consistent. Further, fix errors in ergonomic heap sizing.
Reviewed-by: johnc, jwilhelm, tamao

*** 1615,1648 ****
        tty->print_cr("  Maximum heap size " SIZE_FORMAT, reasonable_max);
      }
      FLAG_SET_ERGO(uintx, MaxHeapSize, (uintx)reasonable_max);
    }
  
!   // If the initial_heap_size has not been set with InitialHeapSize
!   // or -Xms, then set it as fraction of the size of physical memory,
!   // respecting the maximum and minimum sizes of the heap.
!   if (FLAG_IS_DEFAULT(InitialHeapSize)) {
      julong reasonable_minimum = (julong)(OldSize + NewSize);
  
      reasonable_minimum = MIN2(reasonable_minimum, (julong)MaxHeapSize);
  
      reasonable_minimum = limit_by_allocatable_memory(reasonable_minimum);
  
      julong reasonable_initial = phys_mem / InitialRAMFraction;
  
!     reasonable_initial = MAX2(reasonable_initial, reasonable_minimum);
      reasonable_initial = MIN2(reasonable_initial, (julong)MaxHeapSize);
  
      reasonable_initial = limit_by_allocatable_memory(reasonable_initial);
  
      if (PrintGCDetails && Verbose) {
        // Cannot use gclog_or_tty yet.
        tty->print_cr("  Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
-       tty->print_cr("  Minimum heap size " SIZE_FORMAT, (uintx)reasonable_minimum);
      }
      FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
!     set_min_heap_size((uintx)reasonable_minimum);
    }
  }
  
  // This must be called after ergonomics because we want bytecode rewriting
  // if the server compiler is used, or if UseSharedSpaces is disabled.
--- 1615,1656 ----
        tty->print_cr("  Maximum heap size " SIZE_FORMAT, reasonable_max);
      }
      FLAG_SET_ERGO(uintx, MaxHeapSize, (uintx)reasonable_max);
    }
  
!   // If the minimum or initial heap_size have not been set or requested to be set
!   // ergonomically, set them accordingly.
!   if (InitialHeapSize == 0 || min_heap_size() == 0) {
      julong reasonable_minimum = (julong)(OldSize + NewSize);
  
      reasonable_minimum = MIN2(reasonable_minimum, (julong)MaxHeapSize);
  
      reasonable_minimum = limit_by_allocatable_memory(reasonable_minimum);
  
+     if (InitialHeapSize == 0) {
        julong reasonable_initial = phys_mem / InitialRAMFraction;
  
!       reasonable_initial = MAX3(reasonable_initial, reasonable_minimum, (julong)min_heap_size());
        reasonable_initial = MIN2(reasonable_initial, (julong)MaxHeapSize);
  
        reasonable_initial = limit_by_allocatable_memory(reasonable_initial);
  
        if (PrintGCDetails && Verbose) {
          // Cannot use gclog_or_tty yet.
          tty->print_cr("  Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
        }
        FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
!     }
!     // If the minimum heap size has not been set (via -Xms),
!     // synchronize with InitialHeapSize to avoid errors with the default value.
!     if (min_heap_size() == 0) {
!       set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
!       if (PrintGCDetails && Verbose) {
!         // Cannot use gclog_or_tty yet.
!         tty->print_cr("  Minimum heap size " SIZE_FORMAT, min_heap_size());
!       }
!     }
    }
  }
  
  // This must be called after ergonomics because we want bytecode rewriting
  // if the server compiler is used, or if UseSharedSpaces is disabled.
*** 2375,2396 ****
        FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
        FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
      // -Xms
      } else if (match_option(option, "-Xms", &tail)) {
        julong long_initial_heap_size = 0;
!       ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid initial heap size: %s\n", option->optionString);
          describe_range_error(errcode);
          return JNI_EINVAL;
        }
        FLAG_SET_CMDLINE(uintx, InitialHeapSize, (uintx)long_initial_heap_size);
        // Currently the minimum size and the initial heap sizes are the same.
        set_min_heap_size(InitialHeapSize);
      // -Xmx
!     } else if (match_option(option, "-Xmx", &tail)) {
        julong long_max_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid maximum heap size: %s\n", option->optionString);
--- 2383,2405 ----
        FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
        FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
      // -Xms
      } else if (match_option(option, "-Xms", &tail)) {
        julong long_initial_heap_size = 0;
!       // an initial heap size of 0 means automatically determine
!       ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 0);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid initial heap size: %s\n", option->optionString);
          describe_range_error(errcode);
          return JNI_EINVAL;
        }
        FLAG_SET_CMDLINE(uintx, InitialHeapSize, (uintx)long_initial_heap_size);
        // Currently the minimum size and the initial heap sizes are the same.
        set_min_heap_size(InitialHeapSize);
      // -Xmx
!     } else if (match_option(option, "-Xmx", &tail) || match_option(option, "-XX:MaxHeapSize=", &tail)) {
        julong long_max_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid maximum heap size: %s\n", option->optionString);