jvmOpts is a string, not a list

This commit is contained in:
niten 2022-09-05 17:36:17 -07:00
parent b6af716005
commit aa7a06d6b4
1 changed files with 30 additions and 28 deletions

View File

@ -69,34 +69,36 @@ in {
gamemode = cfg.game-mode; gamemode = cfg.game-mode;
allow-cheats = true; allow-cheats = true;
}; };
jvmOpts = [ jvmOpts = let
"-Xms${toString cfg.allocated-memory}G" opts = [
"-Xmx${toString cfg.allocated-memory}G" "-Xms${toString cfg.allocated-memory}G"
"-XX:+UseG1GC" "-Xmx${toString cfg.allocated-memory}G"
"-XX:+ParallelRefProcEnabled" "-XX:+UseG1GC"
"-XX:MaxGCPauseMillis=200" "-XX:+ParallelRefProcEnabled"
"-XX:+UnlockExperimentalVMOptions" "-XX:MaxGCPauseMillis=200"
"-XX:+DisableExplicitGC" "-XX:+UnlockExperimentalVMOptions"
"-XX:+AlwaysPreTouch" "-XX:+DisableExplicitGC"
"-XX:G1NewSizePercent=30" "-XX:+AlwaysPreTouch"
"-XX:G1MaxNewSizePercent=40" "-XX:G1NewSizePercent=30"
"-XX:G1HeapRegionSize=8M" "-XX:G1MaxNewSizePercent=40"
"-XX:G1ReservePercent=20" "-XX:G1HeapRegionSize=8M"
"-XX:G1HeapWastePercent=5" "-XX:G1ReservePercent=20"
"-XX:G1MixedGCCountTarget=4" "-XX:G1HeapWastePercent=5"
"-XX:InitiatingHeapOccupancyPercent=15" "-XX:G1MixedGCCountTarget=4"
"-XX:G1MixedGCLiveThresholdPercent=90" "-XX:InitiatingHeapOccupancyPercent=15"
"-XX:G1RSetUpdatingPauseTimePercent=5" "-XX:G1MixedGCLiveThresholdPercent=90"
"-XX:SurvivorRatio=32" "-XX:G1RSetUpdatingPauseTimePercent=5"
"-XX:+PerfDisableSharedMem" "-XX:SurvivorRatio=32"
"-XX:MaxTenuringThreshold=1" "-XX:+PerfDisableSharedMem"
] ++ (optionals (cfg.allocated-memory >= 12) [ "-XX:MaxTenuringThreshold=1"
"-XX:G1NewSizePercent=40" ] ++ (optionals (cfg.allocated-memory >= 12) [
"-XX:G1MaxNewSizePercent=50" "-XX:G1NewSizePercent=40"
"-XX:G1HeapRegionSize=16M" "-XX:G1MaxNewSizePercent=50"
"-XX:G1ReservePercent=15" "-XX:G1HeapRegionSize=16M"
"-XX:InitiatingHeapOccupancyPercent=20" "-XX:G1ReservePercent=15"
]); "-XX:InitiatingHeapOccupancyPercent=20"
]);
in concatStringsSep " " opts;
}; };
}; };
} }