Merge branch 'trigger-manual-gc-earlier' into next

hyphanet · Dec 1, 2024 · 85027a9 · 85027a9
2 parents 25916aa + fdc6f6f
commit 85027a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 155 deletions.
diff --git a/src/freenet/config/SubConfig.java b/src/freenet/config/SubConfig.java
@@ -172,47 +172,53 @@ public int getInt(String optionName) {
 		synchronized(this) {
 			o = (IntOption) map.get(optionName);
 		}
-		return o.getValue();
+		// return fallback value for ignored options (null). This avoids breaking plugins which try to get ignored options.
+		return o == null ? -1 : o.getValue();
 	}
 
 	public long getLong(String optionName) {
 		LongOption o;
 		synchronized(this) {
 			o = (LongOption) map.get(optionName);
 		}
-		return o.getValue();
+		// return fallback value for ignored options (null). This avoids breaking plugins which try to get ignored options.
+		return o == null ? -1L : o.getValue();
 	}
 
 	public boolean getBoolean(String optionName) {
 		BooleanOption o;
 		synchronized(this) {
 			o = (BooleanOption) map.get(optionName);
 		}
-		return o.getValue();
+		// return fallback value for ignored options (null). This avoids breaking plugins which try to get ignored options.
+		return o == null ? false : o.getValue();
 	}
 
 	public String getString(String optionName) {
 		StringOption o;
 		synchronized(this) {
 			o = (StringOption) map.get(optionName);
 		}
-		return o.getValue().trim();
+		// return fallback value for ignored options (null). This avoids breaking plugins which try to get ignored options.
+		return o == null ? "" : o.getValue().trim();
 	}
 
 	public String[] getStringArr(String optionName) {
 		StringArrOption o;
 		synchronized(this) {
 			o = (StringArrOption) map.get(optionName);
 		}
-		return o.getValue();
+		// return fallback value for ignored options (null). This avoids breaking plugins which try to get ignored options.
+		return o == null ? new String[]{} : o.getValue();
 	}
 
 	public short getShort(String optionName) {
 		ShortOption o;
 		synchronized(this) {
 			o = (ShortOption) map.get(optionName);
 		}
-		return o.getValue();
+		// return fallback value for ignored options (null). This avoids breaking plugins which try to get ignored options.
+		return o == null ? -1 : o.getValue();
 	}
 
 	public Option<?> removeOption(String optionName) {

diff --git a/src/freenet/node/MemoryChecker.java b/src/freenet/node/MemoryChecker.java
diff --git a/src/freenet/node/NodeStats.java b/src/freenet/node/NodeStats.java
@@ -125,7 +125,6 @@ final int[] getCounts(final int[] total) {
 	private volatile long maxPingTime;
 
 	final Node node;
-	private MemoryChecker myMemoryChecker;
 	public final PeerManager peers;
 
 	final RandomSource hardRandom;
@@ -284,10 +283,6 @@ public void shouldUpdate(){
 	final StringCounter preemptiveRejectReasons;
 	final StringCounter localPreemptiveRejectReasons;
 
-	// Enable this if you run into hard to debug OOMs.
-	// Disabled to prevent long pauses every 30 seconds.
-	private int aggressiveGCModificator = -1 /*250*/;
-
 	// Peers stats
 	/** Next time to update PeerManagerUserAlert stats */
 	private long nextPeerManagerUserAlertStatsUpdateTime = -1;
@@ -407,43 +402,9 @@ public void set(Integer val) throws InvalidConfigValueException {
 		threadLimit = statsConfig.getInt("threadLimit");
 
 		// Yes it could be in seconds insteed of multiples of 0.12, but we don't want people to play with it :)
-		statsConfig.register("aggressiveGC", aggressiveGCModificator, sortOrder++, true, false, "NodeStat.aggressiveGC", "NodeStat.aggressiveGCLong",
-				new IntCallback() {
-					@Override
-					public Integer get() {
-						return aggressiveGCModificator;
-					}
-					@Override
-					public void set(Integer val) throws InvalidConfigValueException {
-						if (get().equals(val))
-					        return;
-						Logger.normal(this, "Changing aggressiveGCModificator to "+val);
-						aggressiveGCModificator = val;
-					}
-		},false);
-		aggressiveGCModificator = statsConfig.getInt("aggressiveGC");
-
-		myMemoryChecker = new MemoryChecker(node.getTicker(), aggressiveGCModificator);
-		statsConfig.register("memoryChecker", true, sortOrder++, true, false, "NodeStat.memCheck", "NodeStat.memCheckLong",
-				new BooleanCallback(){
-					@Override
-					public Boolean get() {
-						return myMemoryChecker.isRunning();
-					}
-
-					@Override
-					public void set(Boolean val) throws InvalidConfigValueException {
-						if (get().equals(val))
-					        return;
+		statsConfig.registerIgnoredOption("aggressiveGC");
 
-						if(val)
-							myMemoryChecker.start();
-						else
-							myMemoryChecker.terminate();
-					}
-		});
-		if(statsConfig.getBoolean("memoryChecker"))
-			myMemoryChecker.start();
+		statsConfig.registerIgnoredOption("memoryChecker");
 
 		statsConfig.register("ignoreLocalVsRemoteBandwidthLiability", false, sortOrder++, true, false, "NodeStat.ignoreLocalVsRemoteBandwidthLiability", "NodeStat.ignoreLocalVsRemoteBandwidthLiabilityLong", new BooleanCallback() {