tune heap size

warmuuh · Mar 21, 2024 · d82ca3a · d82ca3a
1 parent 3e708d4
commit d82ca3a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 22 deletions.
diff --git a/docs/script-api.md b/docs/script-api.md
@@ -35,12 +35,12 @@ pre or post scripts.
   * useReflection (boolean)
 #### Response properties
 
-* Aspect `headers` (GrpcResponseHeaderAspect)
-  * entries (CompletableFuture)
-  * name (String)
 * Aspect `Payload` (GrpcResponsePayloadAspect)
   * name (String)
   * payloads (Flux)
+* Aspect `headers` (GrpcResponseHeaderAspect)
+  * entries (CompletableFuture)
+  * name (String)
 
 ### Request Type: HTTP
 
@@ -49,23 +49,23 @@ pre or post scripts.
 * Aspect `headers` (RestHeaderAspect)
   * entries (List)
   * name (String)
-* Aspect `body` (RestBodyAspect)
-  * body (String)
-  * name (String)
 * Aspect `query` (RestQueryParamAspect)
   * entries (List)
   * name (String)
+* Aspect `body` (RestBodyAspect)
+  * body (String)
+  * name (String)
 #### Response properties
 
 * Aspect `headers` (RestResponseHeaderAspect)
   * entries (List)
   * name (String)
-* Aspect `debugBody` (DebugRequestBodyAspect)
-  * body (String)
-  * name (String)
 * Aspect `debugHeaders` (DebugRequestHeaderAspect)
   * entries (List)
   * name (String)
+* Aspect `debugBody` (DebugRequestBodyAspect)
+  * body (String)
+  * name (String)
 * Aspect `body` (RestResponseBodyAspect)
   * body (Flux)
   * name (String)
@@ -74,12 +74,12 @@ pre or post scripts.
 
 #### Request properties
 
-* Aspect `query` (NosqlQueryAspect)
-  * name (String)
-  * query (String)
 * Aspect `parameters` (NosqlParameterAspect)
   * entries (List)
   * name (String)
+* Aspect `query` (NosqlQueryAspect)
+  * name (String)
+  * query (String)
 #### Response properties
 
 * Aspect `result` (NosqlResponseAspect)
@@ -105,14 +105,14 @@ pre or post scripts.
 
 #### Request properties
 
-* Aspect `sio` (SocketIOAspect)
-  * event (String)
-  * message (String)
-  * name (String)
 * Aspect `settings` (SocketIoSettingsAspect)
   * clientVersion (SocketIoVersion)
   * handshakePath (String)
   * name (String)
+* Aspect `sio` (SocketIOAspect)
+  * event (String)
+  * message (String)
+  * name (String)
 #### Response properties
 
 * Aspect `sioBody` (SocketIOResponseAspect)

diff --git a/milkman-dist/pom.xml b/milkman-dist/pom.xml
@@ -154,6 +154,7 @@
 								<opts>
 									<opt>-XX:SharedArchiveFile=app-cds.jsa</opt>
 									<opt>-client</opt>
+									<opt>-Xmx2G</opt>
 									<opt>-XX:+UseCompressedOops</opt>
 									<opt>-XX:+UseCompressedClassPointers</opt>
 <!-- 									<opt>-Xlog:class+load:file=cds3.log</opt> -->

diff --git a/milkman-dist/src/bin/cli/mm.sh b/milkman-dist/src/bin/cli/mm.sh
@@ -10,7 +10,7 @@ fi
 chmod +x "$JRE_DIR"/bin/java
 
 "$JRE_DIR"/bin/java \
-	-client \
+	-client -Xmx2G \
   --add-opens java.base/java.lang.reflect=ALL-UNNAMED \
 	-cp "$BASE_DIR"/plugins/*:"$BASE_DIR"/milkman.jar:"$BASE_DIR"/milkman-cli.jar milkmancli.MilkmanCli $@
 
diff --git a/milkman-dist/src/bin/linux/milkman.sh b/milkman-dist/src/bin/linux/milkman.sh
@@ -16,7 +16,7 @@ fi
 
 
 "$BASE_DIR"/jre-linux64/bin/java $CDS_COMMAND \
-	-client \
+	-client -Xmx2G \
 	-XX:+UseCompressedOops \
   -Dprism.forceGPU=true \
 	-XX:+UseCompressedClassPointers \

diff --git a/milkman-dist/src/bin/macos-bundle/Milkman.app/Contents/MacOS/Milkman b/milkman-dist/src/bin/macos-bundle/Milkman.app/Contents/MacOS/Milkman
@@ -20,7 +20,7 @@ fi
 
 "$RES_DIR/jre/bin/java" \
     ${CDS_COMMAND}="$CDS_DIR"\
-    -client \
+    -client -Xmx2G \
     -XX:+UseCompressedOops \
     -XX:+UseCompressedClassPointers \
     --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \

diff --git a/milkman-dist/src/bin/macos/milkman.sh b/milkman-dist/src/bin/macos/milkman.sh
@@ -13,7 +13,7 @@ if [ ! -f "app-cds.jsa" ]; then
 fi
 
 ./jre-macos64/bin/java $CDS_COMMAND \
-	-client \
+	-client -Xmx2G \
 	-XX:+UseCompressedOops \
 	-XX:+UseCompressedClassPointers \
 	--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \

diff --git a/milkman-dist/src/bin/win/milkman.bat b/milkman-dist/src/bin/win/milkman.bat
@@ -11,7 +11,7 @@ if not exist "app-cds.jsa" (
 
 @start .\jre-win64\bin\javaw.exe ^
 	%CDS_COMMAND% ^
-	-client ^
+	-client -Xmx2G ^
 	-XX:+UseCompressedOops ^
 	-XX:+UseCompressedClassPointers ^
 	--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED ^

diff --git a/milkman-scripting/src/main/java/milkman/plugin/scripting/ScriptingAspectPlugin.java b/milkman-scripting/src/main/java/milkman/plugin/scripting/ScriptingAspectPlugin.java
@@ -91,10 +91,10 @@ private ScriptExecutor.ExecutionResult executeScript(String source, RequestConta
 
 	@Override
 	public void onPostConstruct() {
-		executor = new NashornExecutor(toaster);
 		new Thread(){
 			@Override
 			public void run() {
+				executor = new NashornExecutor(toaster);
 				//already load scripts
 				((NashornExecutor)executor).initGlobalBindings();
 			}