comparison src/share/vm/runtime/arguments.cpp @ 11083:8b789ce47503

Merge
author roland
date Thu, 04 Jul 2013 01:42:34 -0700
parents 6e3634222155 738e04fb1232
children fa6929d0b0a9 7ac80525ece9
comparison
equal deleted inserted replaced
11072:70bea4a43c6d 11083:8b789ce47503
2219 "ContendedPaddingWidth=" INTX_FORMAT " must be the multiple of %d\n", 2219 "ContendedPaddingWidth=" INTX_FORMAT " must be the multiple of %d\n",
2220 ContendedPaddingWidth, BytesPerLong); 2220 ContendedPaddingWidth, BytesPerLong);
2221 status = false; 2221 status = false;
2222 } 2222 }
2223 2223
2224 if (ReservedCodeCacheSize < InitialCodeCacheSize) { 2224 // Check lower bounds of the code cache
2225 // Template Interpreter code is approximately 3X larger in debug builds.
2226 uint min_code_cache_size = (CodeCacheMinimumUseSpace DEBUG_ONLY(* 3)) + CodeCacheMinimumFreeSpace;
2227 if (InitialCodeCacheSize < (uintx)os::vm_page_size()) {
2225 jio_fprintf(defaultStream::error_stream(), 2228 jio_fprintf(defaultStream::error_stream(),
2226 "Invalid ReservedCodeCacheSize: %dK. Should be greater than InitialCodeCacheSize=%dK\n", 2229 "Invalid InitialCodeCacheSize=%dK. Must be at least %dK.\n", InitialCodeCacheSize/K,
2230 os::vm_page_size()/K);
2231 status = false;
2232 } else if (ReservedCodeCacheSize < InitialCodeCacheSize) {
2233 jio_fprintf(defaultStream::error_stream(),
2234 "Invalid ReservedCodeCacheSize: %dK. Must be at least InitialCodeCacheSize=%dK.\n",
2227 ReservedCodeCacheSize/K, InitialCodeCacheSize/K); 2235 ReservedCodeCacheSize/K, InitialCodeCacheSize/K);
2236 status = false;
2237 } else if (ReservedCodeCacheSize < min_code_cache_size) {
2238 jio_fprintf(defaultStream::error_stream(),
2239 "Invalid ReservedCodeCacheSize=%dK. Must be at least %uK.\n", ReservedCodeCacheSize/K,
2240 min_code_cache_size/K);
2228 status = false; 2241 status = false;
2229 } 2242 }
2230 2243
2231 return status; 2244 return status;
2232 } 2245 }
2624 FLAG_SET_CMDLINE(intx, ThreadStackSize, 2637 FLAG_SET_CMDLINE(intx, ThreadStackSize,
2625 round_to((int)long_ThreadStackSize, K) / K); 2638 round_to((int)long_ThreadStackSize, K) / K);
2626 // -Xoss 2639 // -Xoss
2627 } else if (match_option(option, "-Xoss", &tail)) { 2640 } else if (match_option(option, "-Xoss", &tail)) {
2628 // HotSpot does not have separate native and Java stacks, ignore silently for compatibility 2641 // HotSpot does not have separate native and Java stacks, ignore silently for compatibility
2629 // -Xmaxjitcodesize 2642 } else if (match_option(option, "-XX:CodeCacheExpansionSize=", &tail)) {
2643 julong long_CodeCacheExpansionSize = 0;
2644 ArgsRange errcode = parse_memory_size(tail, &long_CodeCacheExpansionSize, os::vm_page_size());
2645 if (errcode != arg_in_range) {
2646 jio_fprintf(defaultStream::error_stream(),
2647 "Invalid argument: %s. Must be at least %luK.\n", option->optionString,
2648 os::vm_page_size()/K);
2649 return JNI_EINVAL;
2650 }
2651 FLAG_SET_CMDLINE(uintx, CodeCacheExpansionSize, (uintx)long_CodeCacheExpansionSize);
2630 } else if (match_option(option, "-Xmaxjitcodesize", &tail) || 2652 } else if (match_option(option, "-Xmaxjitcodesize", &tail) ||
2631 match_option(option, "-XX:ReservedCodeCacheSize=", &tail)) { 2653 match_option(option, "-XX:ReservedCodeCacheSize=", &tail)) {
2632 julong long_ReservedCodeCacheSize = 0; 2654 julong long_ReservedCodeCacheSize = 0;
2655
2633 ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, 1); 2656 ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, 1);
2634 if (errcode != arg_in_range) { 2657 if (errcode != arg_in_range) {
2635 jio_fprintf(defaultStream::error_stream(), 2658 jio_fprintf(defaultStream::error_stream(),
2636 "Invalid maximum code cache size: %s.\n", option->optionString); 2659 "Invalid maximum code cache size: %s.\n", option->optionString);
2637 return JNI_EINVAL; 2660 return JNI_EINVAL;