Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv23044/src/freenet/node/rt
Modified Files:
NGRoutingTable.java StandardNodeEstimator.java
Log Message:
6303: Logging for insane estimates etc.
Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRoutingTable.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- NGRoutingTable.java 31 Oct 2003 19:21:20 -0000 1.23
+++ NGRoutingTable.java 4 Nov 2003 15:48:17 -0000 1.24
@@ -284,8 +284,19 @@
int i=0;
while(e.hasMoreElements()) {
NodeEstimator ne = (NodeEstimator)(e.nextElement());
- Estimate es = new Estimate(ne, ne.estimate(k, htl, size,
-
global, pLegitDNF));
+ long estimate = ne.estimate(k, htl, size,
+ global, pLegitDNF);
+ if(estimate > 24 * 3600 * 1000) {
+ if(estimate > 365L * 24L * 3600L * 1000L)
+ Core.logger.log(this, "Ludicrous estimated
time: "+
+ estimate+" for "+ne,
Logger.ERROR);
+ else
+ Core.logger.log(this, "Crazy estimated time: "+
+ estimate+" for "+ne,
Logger.NORMAL);
+ } else if (estimate <= 0)
+ Core.logger.log(this, "Unlikely estimated time: 0 for
"+
+ ne, Logger.NORMAL);
+ Estimate es = new Estimate(ne, estimate);
estimates[i] = es;
i++;
}
Index: StandardNodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- StandardNodeEstimator.java 3 Nov 2003 16:32:24 -0000 1.17
+++ StandardNodeEstimator.java 4 Nov 2003 15:48:17 -0000 1.18
@@ -173,9 +173,13 @@
Core.logger.log(this, "pSuccess = "+pSuccess, Logger.ERROR);
return Long.MAX_VALUE;
}
+ double transferRate = etTransferRate.guessTransferRate(k);
+ if(transferRate == 0.0)
+ Core.logger.log(this, "Insane transfer rate: "+transferRate+"
on "+
+ this, Logger.NORMAL);
double tSuccess =
etSuccessSearch.guessTime(k) +
- (((double)size) / etTransferRate.guessTransferRate(k));
+ (((double)size) / transferRate);
estimate += pSuccess * tSuccess;
if(Core.logger.shouldLog(Logger.MINOR, this))
@@ -187,7 +191,8 @@
tSearchFailed+",
pTransferFailed="+pTransferFailed+
",
tTransferFailed="+tTransferFailed+", pDNF="+pDNF+
", tDNF="+tDNF+",
pLegitDNF="+pLegitDNF
- +", tSuccess="+tSuccess+",
estimate="+estimate+"ms",
+ +", tSuccess="+tSuccess+",
transferRate="+transferRate+
+ ", estimate="+estimate+"ms",
Logger.MINOR);
long e = (long)estimate;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
