Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use LDR_CNTRL on AIX to use 64KB pages and modify removeAixExpectedVars #749

Open
wants to merge 1 commit into
base: openj9
Choose a base branch
from
Open

Use LDR_CNTRL on AIX to use 64KB pages and modify removeAixExpectedVars #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/java.base/unix/native/libjli/java_md.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2020, 2023 All Rights Reserved
* (c) Copyright IBM Corp. 2020, 2024 All Rights Reserved
* ===========================================================================
*/

Expand Down Expand Up @@ -312,6 +312,11 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
if (setenv(mallocOptionsName, mallocOptionsValue, 0) != 0) {
fprintf(stderr, "setenv('MALLOCOPTIONS=multiheap,considersize') failed: performance may be affected\n");
}
const char * ldrCntrlName = "LDR_CNTRL";
const char *ldrCntrlValue = "TEXTPSIZE=64K@DATAPSIZE=64K@STACKPSIZE=64K@SHMPSIZE=64K";
if (setenv(ldrCntrlName, ldrCntrlValue, 0) != 0) {
fprintf(stderr, "setenv('LDR_CNTRL=TEXTPSIZE=64K@DATAPSIZE=64K@STACKPSIZE=64K@SHMPSIZE=64K') failed: performance may be affected\n");
}
Comment on lines +315 to +319
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency, please remove the space after * on line 315.
Also suggest adding this before setting LDR_CNTRL to keep things organized.

#endif

#ifdef SETENV_REQUIRED
Expand Down
5 changes: 3 additions & 2 deletions test/jdk/java/lang/ProcessBuilder/Basic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2020, 2022 All Rights Reserved
* (c) Copyright IBM Corp. 2020, 2024 All Rights Reserved
* ===========================================================================
*/

Expand Down Expand Up @@ -811,8 +811,9 @@ private static String removeMacExpectedVars(String vars) {
*/
private static String removeAixExpectedVars(String vars) {
String cleanedVars = vars.replace("AIXTHREAD_GUARDPAGES=0,", "");
// OpenJ9 adds MALLOCOPTIONS
// OpenJ9 adds MALLOCOPTIONS and LDR_CNTRL
cleanedVars = cleanedVars.replace("MALLOCOPTIONS=multiheap,considersize,", "");
cleanedVars = cleanedVars.replace("LDR_CNTRL=TEXTPSIZE=64K@DATAPSIZE=64K@STACKPSIZE=64K@SHMPSIZE=64K,", "");
Comment on lines -814 to +816
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The method comment should be updated to list all three expected variables.
Likewise, the comment here should name and the code should remove the variables in alphabetic order (the sentence in the comment should end with a period).

return cleanedVars;
}

Expand Down