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

[t...@freenetproject.org]

Author: toad
Date: 2005-11-26 21:24:03 +0000 (Sat, 26 Nov 2005)
New Revision: 7629

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
244:
new load balancing was a bit too brutal

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2005-11-26 21:16:31 UTC 
(rev 7628)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2005-11-26 21:24:03 UTC 
(rev 7629)
@@ -862,7 +862,7 @@
     public String getStatus() {
         return 
                (isConnected ? "CONNECTED   " : "DISCONNECTED") + " " + 
getPeer().toString()+" "+myName+" "+currentLocation.getValue()+" "+getVersion() 
+
-               " ob="+this.getOtherBiasProbability()+/*" 
adjpRO="+this.getAdjustedPRejectedOverload()+*//*" bias="+getBias()+*/" reqs: 
pRO="+pDataRequestRejectOverload.currentValue()+" 
(h="+pDataRequestRejectOverload.countReports()+") ins: pRO="+ 
pInsertRejectOverload.currentValue()+
+               " ob="+this.getOtherBiasProbability()+" ("+otherBiasValue+") 
"+/*" adjpRO="+this.getAdjustedPRejectedOverload()+*//*" bias="+getBias()+*/" 
reqs: pRO="+pDataRequestRejectOverload.currentValue()+" 
(h="+pDataRequestRejectOverload.countReports()+") ins: pRO="+ 
pInsertRejectOverload.currentValue()+
                                " (h="+pInsertRejectOverload.countReports()+")";
     }

@@ -1046,7 +1046,7 @@

        public double getOtherBiasProbability() {
                synchronized(biasLock) {
-                       double d = otherBiasValue;
+                       double d = otherBiasValue / 100.0;
                        if(d < 0) d = 0.0;
                        d += 1.0;
                        return 1.0 - (1.0 / d);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-26 21:16:31 UTC (rev 
7628)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-26 21:24:03 UTC (rev 
7629)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 243;
+       public static final int buildNumber = 244;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 242;
+       public static final int lastGoodBuild = 244;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;