< prev index next >
src/share/vm/runtime/arguments.cpp
Print this page
*** 1276,1285 ****
--- 1276,1286 ----
// By default YoungPLABSize and OldPLABSize are set to 4096 and 1024 respectively,
// these settings are default for Parallel Scavenger. For ParNew+Tenured configuration
// we set them to 1024 and 1024.
// See CR 6362902.
+ // Default OldPLABSize value is lowered later if CMS:
if (FLAG_IS_DEFAULT(YoungPLABSize)) {
FLAG_SET_DEFAULT(YoungPLABSize, (intx)1024);
}
if (FLAG_IS_DEFAULT(OldPLABSize)) {
FLAG_SET_DEFAULT(OldPLABSize, (intx)1024);
*** 1403,1447 ****
// prefer minuscule survivor spaces so as not to waste
// space for (non-existent) survivors
if (FLAG_IS_DEFAULT(SurvivorRatio) && MaxTenuringThreshold == 0) {
FLAG_SET_ERGO(uintx, SurvivorRatio, MAX2((uintx)1024, SurvivorRatio));
}
! // If OldPLABSize is set and CMSParPromoteBlocksToClaim is not,
! // set CMSParPromoteBlocksToClaim equal to OldPLABSize.
! // This is done in order to make ParNew+CMS configuration to work
! // with YoungPLABSize and OldPLABSize options.
! // See CR 6362902.
! if (!FLAG_IS_DEFAULT(OldPLABSize)) {
! if (FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim)) {
! // OldPLABSize is not the default value but CMSParPromoteBlocksToClaim
! // is. In this situation let CMSParPromoteBlocksToClaim follow
! // the value (either from the command line or ergonomics) of
! // OldPLABSize. Following OldPLABSize is an ergonomics decision.
! FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, OldPLABSize);
! } else {
! // OldPLABSize and CMSParPromoteBlocksToClaim are both set.
! // CMSParPromoteBlocksToClaim is a collector-specific flag, so
! // we'll let it to take precedence.
! jio_fprintf(defaultStream::error_stream(),
! "Both OldPLABSize and CMSParPromoteBlocksToClaim"
! " options are specified for the CMS collector."
! " CMSParPromoteBlocksToClaim will take precedence.\n");
! }
! }
if (!FLAG_IS_DEFAULT(ResizeOldPLAB) && !ResizeOldPLAB) {
// OldPLAB sizing manually turned off: Use a larger default setting,
// unless it was manually specified. This is because a too-low value
// will slow down scavenges.
! if (FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim)) {
! FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, 50); // default value before 6631166
}
}
! // Overwrite OldPLABSize which is the variable we will internally use everywhere.
! FLAG_SET_ERGO(uintx, OldPLABSize, CMSParPromoteBlocksToClaim);
// If either of the static initialization defaults have changed, note this
// modification.
! if (!FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim) || !FLAG_IS_DEFAULT(OldPLABWeight)) {
CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight);
}
if (PrintGCDetails && Verbose) {
tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk",
(unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
--- 1404,1431 ----
// prefer minuscule survivor spaces so as not to waste
// space for (non-existent) survivors
if (FLAG_IS_DEFAULT(SurvivorRatio) && MaxTenuringThreshold == 0) {
FLAG_SET_ERGO(uintx, SurvivorRatio, MAX2((uintx)1024, SurvivorRatio));
}
!
! // OldPLABSize is interpreted in CMS as not the size of the PLAB in words,
! // but rather the number of free blocks of a given size that are used when
! // replenishing the local per-worker free list caches.
! if (FLAG_IS_DEFAULT(OldPLABSize)) {
if (!FLAG_IS_DEFAULT(ResizeOldPLAB) && !ResizeOldPLAB) {
// OldPLAB sizing manually turned off: Use a larger default setting,
// unless it was manually specified. This is because a too-low value
// will slow down scavenges.
! FLAG_SET_ERGO(uintx, OldPLABSize, CFLS_LAB::defaultStaticOldPLABSize); // default value before 6631166
! } else {
! FLAG_SET_DEFAULT(OldPLABSize, CFLS_LAB::defaultDynamicOldPLABSize); // old CMSParPromoteBlocksToClaim default
}
}
!
// If either of the static initialization defaults have changed, note this
// modification.
! if (!FLAG_IS_DEFAULT(OldPLABSize) || !FLAG_IS_DEFAULT(OldPLABWeight)) {
CFLS_LAB::modify_initialization(OldPLABSize, OldPLABWeight);
}
if (PrintGCDetails && Verbose) {
tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk",
(unsigned int) (MarkStackSize / K), (uint) (MarkStackSizeMax / K));
*** 3258,3313 ****
FLAG_SET_CMDLINE(bool, AlwaysTenure, true);
} else {
FLAG_SET_CMDLINE(bool, NeverTenure, false);
FLAG_SET_CMDLINE(bool, AlwaysTenure, false);
}
- } else if (match_option(option, "-XX:+CMSPermGenSweepingEnabled", &tail) ||
- match_option(option, "-XX:-CMSPermGenSweepingEnabled", &tail)) {
- jio_fprintf(defaultStream::error_stream(),
- "Please use CMSClassUnloadingEnabled in place of "
- "CMSPermGenSweepingEnabled in the future\n");
- } else if (match_option(option, "-XX:+UseGCTimeLimit", &tail)) {
- FLAG_SET_CMDLINE(bool, UseGCOverheadLimit, true);
- jio_fprintf(defaultStream::error_stream(),
- "Please use -XX:+UseGCOverheadLimit in place of "
- "-XX:+UseGCTimeLimit in the future\n");
- } else if (match_option(option, "-XX:-UseGCTimeLimit", &tail)) {
- FLAG_SET_CMDLINE(bool, UseGCOverheadLimit, false);
- jio_fprintf(defaultStream::error_stream(),
- "Please use -XX:-UseGCOverheadLimit in place of "
- "-XX:-UseGCTimeLimit in the future\n");
- // The TLE options are for compatibility with 1.3 and will be
- // removed without notice in a future release. These options
- // are not to be documented.
- } else if (match_option(option, "-XX:MaxTLERatio=", &tail)) {
- // No longer used.
- } else if (match_option(option, "-XX:+ResizeTLE", &tail)) {
- FLAG_SET_CMDLINE(bool, ResizeTLAB, true);
- } else if (match_option(option, "-XX:-ResizeTLE", &tail)) {
- FLAG_SET_CMDLINE(bool, ResizeTLAB, false);
- } else if (match_option(option, "-XX:+PrintTLE", &tail)) {
- FLAG_SET_CMDLINE(bool, PrintTLAB, true);
- } else if (match_option(option, "-XX:-PrintTLE", &tail)) {
- FLAG_SET_CMDLINE(bool, PrintTLAB, false);
- } else if (match_option(option, "-XX:TLEFragmentationRatio=", &tail)) {
- // No longer used.
- } else if (match_option(option, "-XX:TLESize=", &tail)) {
- julong long_tlab_size = 0;
- ArgsRange errcode = parse_memory_size(tail, &long_tlab_size, 1);
- if (errcode != arg_in_range) {
- jio_fprintf(defaultStream::error_stream(),
- "Invalid TLAB size: %s\n", option->optionString);
- describe_range_error(errcode);
- return JNI_EINVAL;
- }
- FLAG_SET_CMDLINE(uintx, TLABSize, long_tlab_size);
- } else if (match_option(option, "-XX:TLEThreadRatio=", &tail)) {
- // No longer used.
- } else if (match_option(option, "-XX:+UseTLE", &tail)) {
- FLAG_SET_CMDLINE(bool, UseTLAB, true);
- } else if (match_option(option, "-XX:-UseTLE", &tail)) {
- FLAG_SET_CMDLINE(bool, UseTLAB, false);
} else if (match_option(option, "-XX:+DisplayVMOutputToStderr", &tail)) {
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, false);
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true);
} else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) {
FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
--- 3242,3251 ----
*** 3327,3384 ****
} else if (match_option(option, "-XX:+FullGCALot", &tail)) {
FLAG_SET_CMDLINE(bool, FullGCALot, true);
// disable scavenge before parallel mark-compact
FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false);
#endif
- } else if (match_option(option, "-XX:CMSParPromoteBlocksToClaim=", &tail)) {
- julong cms_blocks_to_claim = (julong)atol(tail);
- FLAG_SET_CMDLINE(uintx, CMSParPromoteBlocksToClaim, cms_blocks_to_claim);
- jio_fprintf(defaultStream::error_stream(),
- "Please use -XX:OldPLABSize in place of "
- "-XX:CMSParPromoteBlocksToClaim in the future\n");
- } else if (match_option(option, "-XX:ParCMSPromoteBlocksToClaim=", &tail)) {
- julong cms_blocks_to_claim = (julong)atol(tail);
- FLAG_SET_CMDLINE(uintx, CMSParPromoteBlocksToClaim, cms_blocks_to_claim);
- jio_fprintf(defaultStream::error_stream(),
- "Please use -XX:OldPLABSize in place of "
- "-XX:ParCMSPromoteBlocksToClaim in the future\n");
- } else if (match_option(option, "-XX:ParallelGCOldGenAllocBufferSize=", &tail)) {
- julong old_plab_size = 0;
- ArgsRange errcode = parse_memory_size(tail, &old_plab_size, 1);
- if (errcode != arg_in_range) {
- jio_fprintf(defaultStream::error_stream(),
- "Invalid old PLAB size: %s\n", option->optionString);
- describe_range_error(errcode);
- return JNI_EINVAL;
- }
- FLAG_SET_CMDLINE(uintx, OldPLABSize, old_plab_size);
- jio_fprintf(defaultStream::error_stream(),
- "Please use -XX:OldPLABSize in place of "
- "-XX:ParallelGCOldGenAllocBufferSize in the future\n");
- } else if (match_option(option, "-XX:ParallelGCToSpaceAllocBufferSize=", &tail)) {
- julong young_plab_size = 0;
- ArgsRange errcode = parse_memory_size(tail, &young_plab_size, 1);
- if (errcode != arg_in_range) {
- jio_fprintf(defaultStream::error_stream(),
- "Invalid young PLAB size: %s\n", option->optionString);
- describe_range_error(errcode);
- return JNI_EINVAL;
- }
- FLAG_SET_CMDLINE(uintx, YoungPLABSize, young_plab_size);
- jio_fprintf(defaultStream::error_stream(),
- "Please use -XX:YoungPLABSize in place of "
- "-XX:ParallelGCToSpaceAllocBufferSize in the future\n");
} else if (match_option(option, "-XX:CMSMarkStackSize=", &tail) ||
match_option(option, "-XX:G1MarkStackSize=", &tail)) {
julong stack_size = 0;
ArgsRange errcode = parse_memory_size(tail, &stack_size, 1);
if (errcode != arg_in_range) {
jio_fprintf(defaultStream::error_stream(),
"Invalid mark stack size: %s\n", option->optionString);
describe_range_error(errcode);
return JNI_EINVAL;
}
FLAG_SET_CMDLINE(uintx, MarkStackSize, stack_size);
} else if (match_option(option, "-XX:CMSMarkStackSizeMax=", &tail)) {
julong max_stack_size = 0;
ArgsRange errcode = parse_memory_size(tail, &max_stack_size, 1);
if (errcode != arg_in_range) {
--- 3265,3287 ----
} else if (match_option(option, "-XX:+FullGCALot", &tail)) {
FLAG_SET_CMDLINE(bool, FullGCALot, true);
// disable scavenge before parallel mark-compact
FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false);
#endif
} else if (match_option(option, "-XX:CMSMarkStackSize=", &tail) ||
match_option(option, "-XX:G1MarkStackSize=", &tail)) {
julong stack_size = 0;
ArgsRange errcode = parse_memory_size(tail, &stack_size, 1);
if (errcode != arg_in_range) {
jio_fprintf(defaultStream::error_stream(),
"Invalid mark stack size: %s\n", option->optionString);
describe_range_error(errcode);
return JNI_EINVAL;
}
+ jio_fprintf(defaultStream::error_stream(),
+ "Please use -XX:MarkStackSize in place of "
+ "-XX:CMSMarkStackSize or -XX:G1MarkStackSize in the future\n");
FLAG_SET_CMDLINE(uintx, MarkStackSize, stack_size);
} else if (match_option(option, "-XX:CMSMarkStackSizeMax=", &tail)) {
julong max_stack_size = 0;
ArgsRange errcode = parse_memory_size(tail, &max_stack_size, 1);
if (errcode != arg_in_range) {
*** 3386,3404 ****
--- 3289,3313 ----
"Invalid maximum mark stack size: %s\n",
option->optionString);
describe_range_error(errcode);
return JNI_EINVAL;
}
+ jio_fprintf(defaultStream::error_stream(),
+ "Please use -XX:MarkStackSizeMax in place of "
+ "-XX:CMSMarkStackSizeMax in the future\n");
FLAG_SET_CMDLINE(uintx, MarkStackSizeMax, max_stack_size);
} else if (match_option(option, "-XX:ParallelMarkingThreads=", &tail) ||
match_option(option, "-XX:ParallelCMSThreads=", &tail)) {
uintx conc_threads = 0;
if (!parse_uintx(tail, &conc_threads, 1)) {
jio_fprintf(defaultStream::error_stream(),
"Invalid concurrent threads: %s\n", option->optionString);
return JNI_EINVAL;
}
+ jio_fprintf(defaultStream::error_stream(),
+ "Please use -XX:ConcGCThreads in place of "
+ "-XX:ParallelMarkingThreads or -XX:ParallelCMSThreads in the future\n");
FLAG_SET_CMDLINE(uintx, ConcGCThreads, conc_threads);
} else if (match_option(option, "-XX:MaxDirectMemorySize=", &tail)) {
julong max_direct_memory_size = 0;
ArgsRange errcode = parse_memory_size(tail, &max_direct_memory_size, 0);
if (errcode != arg_in_range) {
< prev index next >