swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-28 23:16:15 -04:00
Code Issues Projects Releases Wiki Activity

add the javaUseXcheck option to ServerGame to allow for use of the jni linting/checking system, which spams shitloads of output

Browse Source
This commit is contained in:
DarthArgus
2016-02-19 19:01:21 -06:00
parent d3666f0fa3
commit fe09cb38c1
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/JavaLibrary.cpp
+7 -6
View File
@@ -1168,17 +1168,18 @@ void JavaLibrary::initializeJavaThread()
// java 1.8 and higher uses metaspace...which is apparently unlimited by default
#if defined(JNI_VERSION_1_8) || defined(JNI_VERSION_1_9)
tempOption.optionString = "-XX:MetaspaceSize=512m";
tempOption.optionString = "-XX:MetaspaceSize=128m";
options.push_back(tempOption);
#endif
// these don't seem to play nice with java/JNI >= 7
#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7)
tempOption.optionString = "-Xrs";
options.push_back(tempOption);
tempOption.optionString = "-Xcheck:jni";
options.push_back(tempOption);
#endif
if (ConfigServerGame::getUseJavaXcheck())
{
tempOption.optionString = "-Xcheck:jni";
options.push_back(tempOption);
}
if (ConfigServerGame::getCompileScripts())
{