Author: toad Date: 2006-09-28 17:31:57 +0000 (Thu, 28 Sep 2006) New Revision: 10548
Modified: trunk/freenet/src/freenet/node/NodePinger.java trunk/freenet/src/freenet/node/PeerNode.java Log: Share the new upper limit on ping times with PeerNode. Modified: trunk/freenet/src/freenet/node/NodePinger.java =================================================================== --- trunk/freenet/src/freenet/node/NodePinger.java 2006-09-28 17:28:23 UTC (rev 10547) +++ trunk/freenet/src/freenet/node/NodePinger.java 2006-09-28 17:31:57 UTC (rev 10548) @@ -1,3 +1,6 @@ +/* This code is part of Freenet. It is distributed under the GNU General + * Public License, version 2 (or at your option any later version). See + * http://www.gnu.org/ for further details of the GPL. */ package freenet.node; import java.util.Arrays; @@ -10,6 +13,8 @@ */ public class NodePinger implements Runnable { + static final double CRAZY_MAX_PING_TIME = 365.25*24*60*60*1000; + private double meanPing = 0; /** Average over time to avoid nodes flitting in and out of backoff having too much impact. */ private TimeDecayingRunningAverage tdra; @@ -17,7 +22,7 @@ NodePinger(Node n) { this.node = n; this.tdra = new TimeDecayingRunningAverage(0.0, 30*1000, // 30 seconds - 0.0, 365.25*24*60*60*1000); + 0.0, CRAZY_MAX_PING_TIME); } void start() { Modified: trunk/freenet/src/freenet/node/PeerNode.java =================================================================== --- trunk/freenet/src/freenet/node/PeerNode.java 2006-09-28 17:28:23 UTC (rev 10547) +++ trunk/freenet/src/freenet/node/PeerNode.java 2006-09-28 17:31:57 UTC (rev 10548) @@ -494,7 +494,7 @@ // A SimpleRunningAverage would be a bad choice because it would cause oscillations. // So go for a filter. pingAverage = - new TimeDecayingRunningAverage(1, 600*1000 /* should be significantly longer than a typical transfer */, 0, Long.MAX_VALUE); + new TimeDecayingRunningAverage(1, 600*1000 /* should be significantly longer than a typical transfer */, 0, NodePinger.CRAZY_MAX_PING_TIME); // TDRA for probability of rejection pRejected =
