Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv31561/src/freenet/node
Modified Files:
ConnectionOpener.java
Log Message:
6225:
Iakin:
* Logging fixes
* Fix a common, nasty NullPointerException introduced recently.
Me:
* Calculate total bytes queued in trailers, including what is sending and what is
queued, across all PeerHandlers. Use this for a reasonably accurate queue length in
OCM infolet.
- Message.trailerLength()
- PeerHandler.queuedBytes()
- OCM.totalSendQueueSize()
* Try to find error in ConnectionOpener causing stack track starting on Random.getInt
* Logging improvements.
Index: ConnectionOpener.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/ConnectionOpener.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConnectionOpener.java 8 Oct 2003 22:54:18 -0000 1.16
+++ ConnectionOpener.java 9 Oct 2003 00:23:40 -0000 1.17
@@ -193,12 +193,19 @@
currentDelay = startBackoffDelay +
Core.randSource.nextInt(startBackoffDelay);
} else {
- Core.logger.log(this, "baseBackoffDelay="+baseBackoffDelay+
+ int bbd = baseBackoffDelay;
+ Core.logger.log(this, "baseBackoffDelay="+bbd+
", currentDelay="+currentDelay+" ("+this+")",
Logger.DEBUG);
baseBackoffDelay = baseBackoffDelay << 1;
- currentDelay = (baseBackoffDelay >> 1) +
- Core.randSource.nextInt(baseBackoffDelay >> 1);
+ if(bbd <= 0) {
+ Core.logger.log(this, "baseBackoffDelay="+bbd+
+ " - <= 0 ! ("+this+")", Logger.ERROR);
+ bbd = 0;
+ } else {
+ bbd = Core.randSource.nextInt(bbd);
+ }
+ currentDelay = (baseBackoffDelay >> 1) + bbd;
}
if(logDEBUG)
Core.logger.log(this, "Rescheduling "+this+" in "+
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
