[freenet-cvs] r18123 - in trunk/freenet/src/freenet: l10n node node/useralerts support/io

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-02-23 09:39:12 +0000 (Sat, 23 Feb 2008)
New Revision: 18123

Modified:
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java
   trunk/freenet/src/freenet/support/io/NativeThread.java
Log:
NotEnoughNiceLevels: require only 5 different priorities: see http://archives.freenetproject.org/message/20080222.131604.f2b0fae7.en.html

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties	2008-02-23 00:34:06 UTC (rev 18122)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties	2008-02-23 09:39:12 UTC (rev 18123)
@@ -708,7 +708,7 @@
 NodeUpdateManager.updateURI=Where should the node look for updates?
 NodeUpdateManager.updateURILong=Where should the node look for updates?
 NotEnoughNiceLevelsUserAlert.title=Not enough Nice levels available!
-NotEnoughNiceLevelsUserAlert.content=Your node has detected that it is running at a high nice level. It can't perform well if they aren't enough levels available. Please lower the nice level you're node is running at (Look for PRIORITY in the run.sh file)! Currently your node has ${available} levels to play with whereas it would need ${required}.
+NotEnoughNiceLevelsUserAlert.content=Your node has detected that it is running at a high nice level. It can't perform well if they aren't enough levels available. Please lower the nice level you're node is running at (Look for PRIORITY in the run.sh file and lower its value)! Currently your node has ${available} levels to play with whereas it would need ${required}.
 OpennetConnectionsToadlet.successTimeTitle=Last success
 OpennetConnectionsToadlet.successTime=Last time there was a successful CHK fetch from the node
 OpennetConnectionsToadlet.fullTitle=${counts} Strangers (Untrusted Peers) of ${name}

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java	2008-02-23 00:34:06 UTC (rev 18122)
+++ trunk/freenet/src/freenet/node/Node.java	2008-02-23 09:39:12 UTC (rev 18123)
@@ -1706,7 +1706,7 @@
 		else if(NodeStarter.extBuildNumber == -1)
 			clientCore.alerts.register(new ExtOldAgeUserAlert());
 		
-		if(!NativeThread.HAS_PLENTY_NICE_LEVELS)
+		if(!NativeThread.HAS_ENOUGH_NICE_LEVELS)
 			clientCore.alerts.register(new NotEnoughNiceLevelsUserAlert());
 		
 		clientCore.alerts.register(new OpennetUserAlert(this));

Modified: trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java	2008-02-23 00:34:06 UTC (rev 18122)
+++ trunk/freenet/src/freenet/node/useralerts/NotEnoughNiceLevelsUserAlert.java	2008-02-23 09:39:12 UTC (rev 18123)
@@ -28,7 +28,7 @@
 			new String[] { "available", "required" },
 			new String[] { 
 				String.valueOf(NativeThread.NATIVE_PRIORITY_RANGE),
-				String.valueOf(NativeThread.JAVA_PRIORITY_RANGE) 
+				String.valueOf(NativeThread.ENOUGH_NICE_LEVELS) 
 			});
 	}
 

Modified: trunk/freenet/src/freenet/support/io/NativeThread.java
===================================================================
--- trunk/freenet/src/freenet/support/io/NativeThread.java	2008-02-23 00:34:06 UTC (rev 18122)
+++ trunk/freenet/src/freenet/support/io/NativeThread.java	2008-02-23 09:39:12 UTC (rev 18123)
@@ -32,7 +32,7 @@
 	public static boolean HAS_PLENTY_NICE_LEVELS;
 	
 	// 5 is enough generally for our purposes.
-	static final int ENOUGH_NICE_LEVELS = 5;
+	public static final int ENOUGH_NICE_LEVELS = 5;
 	public static final int MIN_PRIORITY = 1;
 	public static final int LOW_PRIORITY = 3;
 	public static final int NORM_PRIORITY = 5;