Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv10856/src/freenet/node/rt
Modified Files:
RoutingPointStore.java StandardNodeEstimator.java
NGRoutingTable.java
Log Message:
Better message inside the thrown IOException in case of limits overflow.
Allow zero-times.. since it is allowed in the time estimators.
Index: RoutingPointStore.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/RoutingPointStore.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- RoutingPointStore.java 4 Nov 2003 17:23:51 -0000 1.9
+++ RoutingPointStore.java 4 Nov 2003 17:39:20 -0000 1.10
@@ -180,9 +180,9 @@
if (time < 0)
throw new IOException("negative value");
if(time < minAllowedTime)
- throw new IOException("Smaller than allowed time
"+time+" detected");
+ throw new IOException("Read time "+time+" smaller than
minimum allowed "+minAllowedTime);
if(time > maxAllowedTime)
- throw new IOException("Larger than allowed time
"+time+" detected");
+ throw new IOException("Read time "+time+" larger than
maximum allowed "+maxAllowedTime);
byte[] b = new byte[Key.KEYBYTES];
i.readFully(b);
BigInteger key = new BigInteger(1, b);
Index: StandardNodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- StandardNodeEstimator.java 4 Nov 2003 17:05:39 -0000 1.20
+++ StandardNodeEstimator.java 4 Nov 2003 17:39:20 -0000 1.21
@@ -69,7 +69,7 @@
rtSearchFailed = raf.create(dis);
Core.logger.log(this, "Serialized in all RunningAverage's",
Logger.DEBUG);
- etSuccessSearch =
rtef.create(dis,ResponseTimeEstimator.convertTime(1000000),ResponseTimeEstimator.convertTime(1));
//1 millisecond to ~20 minutes
+ etSuccessSearch =
rtef.create(dis,ResponseTimeEstimator.convertTime(1000000),ResponseTimeEstimator.convertTime(0));
//0 millisecond to ~20 minutes
Core.logger.log(this, "Serialized in etSuccessSearch",
Logger.DEBUG);
etTransferRate =
rtef.create(dis,ResponseTimeEstimator.convertRate(10000000.0),ResponseTimeEstimator.convertRate(0.001));
//1 byte/s to ~10 megabyte/s
@@ -78,7 +78,7 @@
epDNFGivenConnectionAndNotRejectedOrSearchFailed =
rtef.create(dis,ResponseTimeEstimator.convertProbability(1.0),ResponseTimeEstimator.convertProbability(0.0));
Core.logger.log(this, "Serialized in etDNF",
Logger.DEBUG);
- etDNF =
rtef.create(dis,ResponseTimeEstimator.convertTime(1000000),ResponseTimeEstimator.convertTime(1));
//1 millisecond to ~20 minutes
+ etDNF =
rtef.create(dis,ResponseTimeEstimator.convertTime(1000000),ResponseTimeEstimator.convertTime(0));
//0 millisecond to ~20 minutes
Core.logger.log(this, "Serialized in "+this,
Logger.MINOR);
successes = dis.readInt();
Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRoutingTable.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- NGRoutingTable.java 4 Nov 2003 17:05:40 -0000 1.25
+++ NGRoutingTable.java 4 Nov 2003 17:39:20 -0000 1.26
@@ -82,7 +82,7 @@
try {
fi = new FileInputStream(globalFiles[i]);
dis = new DataInputStream(fi);
- globalEstimator =
timeFactory.create(dis,ResponseTimeEstimator.convertTime(10000000),ResponseTimeEstimator.convertTime(1));//1
ms to ~20 minutes
+ globalEstimator =
timeFactory.create(dis,ResponseTimeEstimator.convertTime(10000000),ResponseTimeEstimator.convertTime(0));//0
ms to ~20 minutes
break;
} catch (IOException e) {
if(Core.logger.shouldLog(Logger.MINOR))
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
