Update of /cvsroot/freenet/freenet/src/freenet/node/states/request
In directory sc8-pr-cvs1:/tmp/cvs-serv23996/src/freenet/node/states/request
Modified Files:
Pending.java
Log Message:
6252
- Change NGRouting discard algorithm: Don't compare by successes if the node you are
comparing to was not created yet at the time of your last success.
-- Keep original creation time for each node's estimator in the RT. Age is displayed
on the node page.
- Make PeerPacket calculate message priorities
-- QueryRejected's don't count at all
-- Identify's count for four
-- Request's count for two
-- Being in the RT counts for one
-- We start at prio message+1 i.e. trailer.
- Fix sending of first packet for a while on conns: We were sending single message
packets even when messages were queued, thus wasting the first packet.
-- Add ConnectionHandler.forceSendPacket() - sends a packet which it gets from the
peerhandler
- Lose most synchronization on NGRT.route(). Add minimal synchronization at a lower
level on StandardNodeEstimator, DecayingRunningAverage etc.
- Delete some unused code from ConnectionHandler, most of it already commented out
- Fix KeyCollisionException in StoreIOException error
- Fix bug in maxConnDefault for macos/x
- Catch race in ASL without throwing
- Logging etc
Index: Pending.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -w -r1.74 -r1.75
--- Pending.java 15 Oct 2003 21:15:48 -0000 1.74
+++ Pending.java 17 Oct 2003 01:43:29 -0000 1.75
@@ -404,14 +404,6 @@
replyTime = System.currentTimeMillis();
// replyTime must be set AFTER verifying Storables
n.ft.remove(searchKey); // remove if in FT.
- } catch (StoreIOException e) {
- // Our fault
- terminateRouting(false, false);
- dr.drop(n);
- n.logger.log(this, "I/O error storing DataReply: "+e+" ("+
- this+")", e, Logger.ERROR);
- fail(n, "I/O error storing DataReply");
- return new RequestDone(this);
} catch (KeyCollisionException e) {
// oh well, try to go to SendingReply
if(logDEBUG)
@@ -435,6 +427,14 @@
Logger.NORMAL);
terminateRouting(false, false); // cache failure? anyway, node not routing
return new RequestDone(this);
+ } catch (StoreIOException e) {
+ // Our fault
+ terminateRouting(false, false);
+ dr.drop(n);
+ n.logger.log(this, "I/O error storing DataReply: "+e+" ("+
+ this+")", e, Logger.ERROR);
+ fail(n, "I/O error storing DataReply");
+ return new RequestDone(this);
} catch (IOException e) {
// Their fault
dr.drop(n);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
