[freenet-cvs] r9744 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2006-07-25 13:10:33 +0000 (Tue, 25 Jul 2006)
New Revision: 9744

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
893:
Check uncontended every second, even if we are receiving many requests: We may 
be receiving many, and rejecting all of them, because bwlimitDelayTime is too 
high and we never check it and correct it!
Comments.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-25 01:25:46 UTC (rev 
9743)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-25 13:10:33 UTC (rev 
9744)
@@ -2369,8 +2369,8 @@
                synchronized(this) {
                        if(now - lastCheckedUncontended > 1000) {
                                checkUncontended = true;
+                               lastCheckedUncontended = now;
                        }
-                       lastCheckedUncontended = now;
                }
                if(checkUncontended && 
throttledPacketSendAverage.lastReportTime() < now - 5000) {  // if last report 
more than 5 seconds ago
                        // shouldn't take long

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-07-25 01:25:46 UTC 
(rev 9743)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-07-25 13:10:33 UTC 
(rev 9744)
@@ -229,7 +229,7 @@
                                if(l > messages[j].submitted) l = 
messages[j].submitted;
                                sz += 2 + /* FIXME only 2? */ 
messages[j].getData(node.packetMangler, pn).length;
                        }
-                       if((l + 100 > now) && (sz < 1024)) {
+                       if((l + 100 > now) && (sz < 1024 /* sensible size */)) {
                                // Don't send immediately
                                if(nextActionTime > (l+100))
                                        nextActionTime = l+100;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-25 01:25:46 UTC (rev 
9743)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-25 13:10:33 UTC (rev 
9744)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 892;
+       private static final int buildNumber = 893;

        /** Oldest build of Fred we will talk to */
        private static final int oldLastGoodBuild = 870;