Author: toad
Date: 2005-10-27 22:00:22 +0000 (Thu, 27 Oct 2005)
New Revision: 7459

Modified:
   branches/legacy/unstable/src/freenet/Version.java
   branches/legacy/unstable/src/freenet/node/Node.java
   branches/legacy/unstable/src/freenet/support/LRUQueue.java
Log:
60276:
Obsolete rtMaxRefs (!!) and update description.
Update description for rtMaxNodes.
Put a serial version on LRUQueue for serialization.

Modified: branches/legacy/unstable/src/freenet/Version.java
===================================================================
--- branches/legacy/unstable/src/freenet/Version.java   2005-10-27 21:16:28 UTC 
(rev 7458)
+++ branches/legacy/unstable/src/freenet/Version.java   2005-10-27 22:00:22 UTC 
(rev 7459)
@@ -21,7 +21,7 @@
        public static String altProtocolVersion = "1.52";
 
        /** The build number of the current revision */
-       public static final int buildNumber = 60275;
+       public static final int buildNumber = 60276;
 
        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 60235;

Modified: branches/legacy/unstable/src/freenet/node/Node.java
===================================================================
--- branches/legacy/unstable/src/freenet/node/Node.java 2005-10-27 21:16:28 UTC 
(rev 7458)
+++ branches/legacy/unstable/src/freenet/node/Node.java 2005-10-27 22:00:22 UTC 
(rev 7459)
@@ -1171,13 +1171,10 @@
                        "Use a datastore index file. Shorter startup time, but 
we have to run checkpoints, which lock the datastore, causing a hiccup");
 
                // rtMaxRefs
-               config.setExpert("rtMaxRefs", true);
+               config.setDeprecated("rtMaxRefs", true);
                config.argDesc("rtMaxRefs", "<integer>");
                config.shortDesc("rtMaxRefs", "max no. of refs per node");
-               config.longDesc(
-                       "rtMaxRefs",
-                       "The number of references allowed per node in the 
routing table.",
-                       "This should not be set too high.");
+               config.longDesc("rtMaxRefs", "Deprecated (hangover from classic 
routing)");
 
                // rtMaxNodes
                config.setExpert("rtMaxNodes", true);
@@ -1185,7 +1182,9 @@
                config.shortDesc("rtMaxNodes", "max no. unique nodes in routing 
table");
                config.longDesc(
                        "rtMaxNodes",
-                       "The number of unique nodes that can be contained in 
the routing table. Note that the node will try to keep an idle connection open 
to each of these, so don't set it to more than half the value of 
maxNodeConnections. Too big or too small will result in inefficient or 
completely useless routing, or slow specialization; the default 50 is 
reasonable (if you see another default, it's because you have an OS with too 
few connections).");
+                       "The number of unique nodes that can be contained in 
the routing table. " +
+                       "IGNORED UNLESS MAXNODECONNECTIONS IS ZERO (normally 
forced to 2 * maxNodeConnections). " +
+                       "Note that the node will try to keep an idle connection 
open to each of these, so don't set it to more than half the value of 
maxNodeConnections. Too big or too small will result in inefficient or 
completely useless routing, or slow specialization; the default 50 is 
reasonable (if you see another default, it's because you have an OS with too 
few connections).");
 
                // doEstimatorSmoothing
                config.setExpert("doEstimatorSmoothing", true);

Modified: branches/legacy/unstable/src/freenet/support/LRUQueue.java
===================================================================
--- branches/legacy/unstable/src/freenet/support/LRUQueue.java  2005-10-27 
21:16:28 UTC (rev 7458)
+++ branches/legacy/unstable/src/freenet/support/LRUQueue.java  2005-10-27 
22:00:22 UTC (rev 7459)
@@ -6,7 +6,12 @@
 
 public class LRUQueue implements Serializable {
 
-    /*
+    /**
+        * Our serial ID 
+        */
+       private static final long serialVersionUID = 0x277f088b03d34608L;
+       
+       /*
      * I've just converted this to using the DLList and Hashtable
      * this makes it Hashtable time instead of O(N) for push and
      * remove, and Hashtable time instead of O(1) for pop.  Since
@@ -92,11 +97,3 @@
         }
     }
 }
-
-
-
-
-
-
-
-

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to