1492

1 files changed, 24 insertions, 16 deletions

diff --git a/wrapper.config b/wrapper.config
index 1f291ef1ce65..c6b523b5e80a 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -3,6 +3,7 @@
 # Wrapper Properties
 #********************************************************************
 # Java Application
+wrapper.working.dir=/opt/freenet
 wrapper.java.command=/usr/lib/jvm/default/bin/java
 
 # Java Main class.  This class must implement the WrapperListener interface
@@ -23,22 +24,21 @@ wrapper.java.additional.auto_bits=TRUE
 
 wrapper.java.additional.1=-Dnetworkaddress.cache.ttl=0
 wrapper.java.additional.2=-Dnetworkaddress.cache.negative.ttl=0
+
 # Needed for some linux distros? Shouldn't prevent using IPv6, just make it prefer IPv4?
-wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
-# You could enable this for debugging, but Freenet will use more CPU if you do.
-#wrapper.java.additional.4=-enableassertions:freenet
-# You might want to set the following line if you have changed java.maxmemory
-# wrapper.java.additional.5=-XX:MaxPermSize=
+#wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
+
 # Use nss for crypto operations
-wrapper.java.additional.6=-Dfreenet.jce.use.NSS=true
+wrapper.java.additional.4=-Dfreenet.jce.use.NSS=true
+
 # Location used to hold temporary files.
-wrapper.java.additional.7=-Djava.io.tmpdir=/opt/freenet/tmp
+wrapper.java.additional.5=-Djava.io.tmpdir=/opt/freenet/tmp
 
-# Initial Java Heap Size (in MB)
-# If a non-zero value is specified for this property then an appropriate -Xms
-#  parameter will be added. The initial memory must be less than or equal to
-#  the value set for the maxmemory property
-#wrapper.java.initmemory=4
+# Open internal modules (required for Java 17)
+wrapper.java.additional.6=--add-opens=java.base/java.io=ALL-UNNAMED
+wrapper.java.additional.7=--add-opens=java.base/java.lang=ALL-UNNAMED
+wrapper.java.additional.8=--add-opens=java.base/java.net=ALL-UNNAMED
+wrapper.java.additional.9=--add-opens=java.base/java.util=ALL-UNNAMED
 
 # Maximum Java Heap Size (in MB)
 wrapper.java.maxmemory=512
@@ -60,7 +60,7 @@ wrapper.console.format=PM
 wrapper.console.loglevel=INFO
 
 # Log file to use for wrapper output logging.
-# You may wish to change this.
+# You may wish to change this or set to empty to disable
 wrapper.logfile=/opt/freenet/wrapper.log
 
 # Format of output for the log file.
@@ -137,6 +137,7 @@ wrapper.console.title=Freenet Router Service
 wrapper.umask=0022
 wrapper.java.umask=0022
 wrapper.logfile.umask=077
+wrapper.max_failed_invocations=1
 
 #********************************************************************
 # Wrapper JVM Checks
@@ -152,6 +153,13 @@ wrapper.filter.message.1=The JVM has run out of memory.
 #********************************************************************
 # Advanced Options
 #********************************************************************
-# Enable the Shenandoah Gargabe Collector
-#wrapper.java.additional.100=-XX:+UnlockExperimentalVMOptions
-#wrapper.java.additional.101=-XX:+UseShenandoahGC
+# Enable the Shenandoah Garbage Collector
+wrapper.java.additional.101=-XX:+UseShenandoahGC
+wrapper.java.additional.102=-XX:+DisableExplicitGC
+
+# Committing heap pages into memory helps to reduce latency hiccups
+wrapper.java.additional.103=-XX:+AlwaysPreTouch
+
+# Using large pages greatly improves performance on large heaps
+# Recommended to set /sys/kernel/mm/transparent_hugepage/enabled and /sys/kernel/mm/transparent_hugepage/defrag to "madvise"
+#wrapper.java.additional.104=XX:+UseTransparentHugePages