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

JDK-8252802: java launcher should set MALLOCOPTIONS and LDR_CNTRL in order to use 64KB pages on AIX #17906

Closed
wants to merge 1 commit into from
Closed

JDK-8252802: java launcher should set MALLOCOPTIONS and LDR_CNTRL in order to use 64KB pages on AIX #17906

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
13 changes: 13 additions & 0 deletions 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 @@ -300,6 +300,19 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
char * jvmtype = NULL;
char **argv = *pargv;

#ifdef AIX
const char *mallocOptionsName = "MALLOCOPTIONS";
const char *mallocOptionsValue = "multiheap,considersize";
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";
if (setenv(ldrCntrlName, ldrCntrlValue, 0) != 0) {
fprintf(stderr, "setenv('LDR_CNTRL=TEXTPSIZE=64K@DATAPSIZE=64K@STACKPSIZE=64K') failed: performance may be affected\n");
}
#endif

#ifdef SETENV_REQUIRED
jboolean mustsetenv = JNI_FALSE;
char *runpath = NULL; /* existing effective LD_LIBRARY_PATH setting */
Expand Down
10 changes: 7 additions & 3 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 @@ -799,11 +799,15 @@ private static String removeMacExpectedVars(String vars) {
}

/* Only used for AIX --
* AIX adds the variable AIXTHREAD_GUARDPAGES=0 to the environment.
* Remove it from the list of env variables
* AIX adds the variables AIXTHREAD_GUARDPAGES=0,
* LDR_CNTRL=TEXTPSIZE=64K@DATAPSIZE=64K@STACKPSIZE=64K, and
* MALLOCOPTIONS=multiheap,considersize, to the environment.
* Remove them from the list of env variables
*/
private static String removeAixExpectedVars(String vars) {
return vars.replace("AIXTHREAD_GUARDPAGES=0,", "");
return vars.replace("AIXTHREAD_GUARDPAGES=0,", "")
.replace("LDR_CNTRL=TEXTPSIZE=64K@DATAPSIZE=64K@STACKPSIZE=64K,","")
.replace("MALLOCOPTIONS=multiheap,considersize,","");
}

private static String sortByLinesWindowsly(String text) {
Expand Down