From 4c03d5eec1af793c1645fbff97c7f454c087a33a Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 3 Feb 2016 13:58:03 -0600 Subject: [PATCH] Revert "bump up the maximum/initial jvm stack limits since we have PAE - 32 bit java seems limited to 2GB max" This reverts commit 77661f7480b210442bdf0eb9984193faf0984eaa. --- .../serverScript/src/shared/JavaLibrary.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index a9039df0..06c5a393 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -1101,6 +1101,13 @@ void JavaLibrary::initializeJavaThread() setenv("LD_LIBRARY_PATH", tmpbuffer, 1); delete [] tmpbuffer; } + + // check if LD_ASSUME_KERNEL is defined + env = getenv("LD_ASSUME_KERNEL"); + if (env == NULL || strcmp(env, "2.4.1") != 0) + { +// WARNING(true, ("LD_ASSUME_KERNEL=2.4.1 not set, Java may not run correctly")); + } } #endif // linux @@ -1178,15 +1185,15 @@ void JavaLibrary::initializeJavaThread() // use options derived from config file settings // set up memory requirements - tempOption.optionString = "-Xms512m"; // minimum or initial stack size, originally was 128m + tempOption.optionString = "-Xms128m"; options.push_back(tempOption); - tempOption.optionString = "-Xmx2048m"; // max stack size (in total?) was originally 512m (we got PAE!) + tempOption.optionString = "-Xmx512m"; options.push_back(tempOption); - tempOption.optionString = "-Xss2m"; // frame stack size, was originally 768 k + tempOption.optionString = "-Xss768k"; options.push_back(tempOption); if (ms_javaVmType == JV_ibm) { - tempOption.optionString = "-Xoss2m"; // max value for the stack size, originally was 768k or so + tempOption.optionString = "-Xoss768k"; options.push_back(tempOption); }