Skip to content

Commit

Permalink
Merge pull request #18026 from dmitripivkine/master
Browse files Browse the repository at this point in the history 
Consume handled JVM command line options
  • Loading branch information
@pshipton
pshipton committed Aug 29, 2023
2 parents f741a14 + dd92807 commit 6256ba4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions runtime/bcutil/jimageintf.c
View file
Expand Up @@ -194,8 +194,8 @@ initJImageIntf(J9JImageIntf **jimageIntf, J9JavaVM *vm, J9PortLibrary *portLibra
Trc_BCU_Assert_True(NULL != jimageIntf);

/* Check for -XX:+UseJ9JImageReader and -XX:-UseJ9JImageReader; whichever comes later wins. */
argIndex1 = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXUSEJ9JIMAGEREADER, NULL);
argIndex2 = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXNOUSEJ9JIMAGEREADER, NULL);
argIndex1 = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXUSEJ9JIMAGEREADER, NULL);
argIndex2 = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNOUSEJ9JIMAGEREADER, NULL);

if (argIndex1 > argIndex2) {
vm->extendedRuntimeFlags |= (UDATA)J9_EXTENDED_RUNTIME_USE_J9JIMAGE_READER;
Expand Down
16 changes: 8 additions & 8 deletions runtime/gc_modron_startup/mmparse.cpp
View file
Expand Up @@ -1281,8 +1281,8 @@ gcParseXXArguments(J9JavaVM *vm)
MM_GCExtensions *extensions = MM_GCExtensions::getExtensions(vm);

{
IDATA heapManagementMXBeanCompatibilityIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:+HeapManagementMXBeanCompatibility", NULL);
IDATA noHheapManagementMXBeanCompatibilityIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:-HeapManagementMXBeanCompatibility", NULL);
IDATA heapManagementMXBeanCompatibilityIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:+HeapManagementMXBeanCompatibility", NULL);
IDATA noHheapManagementMXBeanCompatibilityIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:-HeapManagementMXBeanCompatibility", NULL);
if (heapManagementMXBeanCompatibilityIndex != noHheapManagementMXBeanCompatibilityIndex) {
/* At least one option is set. Find the right most one. */
if (heapManagementMXBeanCompatibilityIndex > noHheapManagementMXBeanCompatibilityIndex) {
Expand All @@ -1294,8 +1294,8 @@ gcParseXXArguments(J9JavaVM *vm)
}

{
IDATA useGCStartupHintsIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:+UseGCStartupHints", NULL);
IDATA noUseGCStartupHintsIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:-UseGCStartupHints", NULL);
IDATA useGCStartupHintsIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:+UseGCStartupHints", NULL);
IDATA noUseGCStartupHintsIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:-UseGCStartupHints", NULL);
if (useGCStartupHintsIndex != noUseGCStartupHintsIndex) {
/* At least one option is set. Find the right most one. */
if (useGCStartupHintsIndex > noUseGCStartupHintsIndex) {
Expand All @@ -1307,8 +1307,8 @@ gcParseXXArguments(J9JavaVM *vm)
}

{
IDATA alwaysPreTouchIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:+AlwaysPreTouch", NULL);
IDATA notAlwaysPreTouchIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:-AlwaysPreTouch", NULL);
IDATA alwaysPreTouchIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:+AlwaysPreTouch", NULL);
IDATA notAlwaysPreTouchIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:-AlwaysPreTouch", NULL);
if (alwaysPreTouchIndex != notAlwaysPreTouchIndex) {
/* At least one option is set. Find the right most one. */
if (alwaysPreTouchIndex > notAlwaysPreTouchIndex) {
Expand All @@ -1320,8 +1320,8 @@ gcParseXXArguments(J9JavaVM *vm)
}

{
IDATA adaptiveGCThreadingIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:+AdaptiveGCThreading", NULL);
IDATA noAdaptiveGCThreadingIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, "-XX:-AdaptiveGCThreading", NULL);
IDATA adaptiveGCThreadingIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:+AdaptiveGCThreading", NULL);
IDATA noAdaptiveGCThreadingIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, "-XX:-AdaptiveGCThreading", NULL);
if (adaptiveGCThreadingIndex != noAdaptiveGCThreadingIndex) {
/* At least one option is set. Find the right most one. */
if (adaptiveGCThreadingIndex > noAdaptiveGCThreadingIndex) {
Expand Down
12 changes: 6 additions & 6 deletions runtime/vm/jvminit.c
View file
Expand Up @@ -2191,8 +2191,8 @@ VMInitStages(J9JavaVM *vm, IDATA stage, void* reserved)
}
}

argIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXNODISCLAIMVIRTUALMEMORY, NULL);
argIndex2 = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXDISCLAIMVIRTUALMEMORY, NULL);
argIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNODISCLAIMVIRTUALMEMORY, NULL);
argIndex2 = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXDISCLAIMVIRTUALMEMORY, NULL);
{
IDATA argIndex3;
argIndex3 = FIND_AND_CONSUME_VMARG(STARTSWITH_MATCH, VMOPT_XSOFTMX, NULL);
Expand All @@ -2210,8 +2210,8 @@ VMInitStages(J9JavaVM *vm, IDATA stage, void* reserved)
}

/* -XX commandline option for +/- TransparentHugepage */
argIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXNOTRANSPARENT_HUGEPAGE, NULL);
argIndex2 = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXTRANSPARENT_HUGEPAGE, NULL);
argIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNOTRANSPARENT_HUGEPAGE, NULL);
argIndex2 = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXTRANSPARENT_HUGEPAGE, NULL);
{
/* Last instance of +/- TransparentHugepage found on the command line wins
*
Expand All @@ -2224,8 +2224,8 @@ VMInitStages(J9JavaVM *vm, IDATA stage, void* reserved)
}
}

argIndex = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXNLSMESSAGES, NULL);
argIndex2 = FIND_ARG_IN_VMARGS(EXACT_MATCH, VMOPT_XXNONLSMESSAGES, NULL);
argIndex = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNLSMESSAGES, NULL);
argIndex2 = FIND_AND_CONSUME_VMARG(EXACT_MATCH, VMOPT_XXNONLSMESSAGES, NULL);
if (argIndex2 > argIndex) {
j9port_control(OMRPORT_CTLDATA_NLS_DISABLE, 1);
}
Expand Down

0 comments on commit 6256ba4

Please sign in to comment.