Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv16436/src/freenet
Modified Files:
PeerHandler.java Version.java
Log Message:
change needsConnection(true) logic again... should significantly reduce number of
conns opened.
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- PeerHandler.java 14 Oct 2003 23:06:18 -0000 1.18
+++ PeerHandler.java 15 Oct 2003 01:57:55 -0000 1.19
@@ -136,9 +136,10 @@
", messagesWithTrailers="+
messagesWithTrailers.size(),
Logger.DEBUG);
boolean quitNow = false;
+ boolean inRT = false;
if(weak) {
quitNow = messages.isEmpty() && messagesWithTrailers.isEmpty()
&&
- (id == null || (!(node.rt.references(id))));
+ (id == null || (!(inRT = node.rt.references(id))));
if(quitNow && connectionHandlers.isEmpty()) {
if(Core.logger.shouldLog(Logger.DEBUG, this))
Core.logger.log(this, "returning false
immediately",
@@ -195,8 +196,9 @@
" closed "+closedCount+",
sending "+
sendingCount+", free
"+freeCount, Logger.DEBUG);
if(weak) {
- if(notSendingCount < 2 // less than 2 free to send
- || notReceivingCount < 1) // less than 1 free to receive
+ if(inRT && notSendingCount < 2 // need 2 free to send if in RT
+ || notSendingCount < 1 // need 1 free to send if not in RT
+ || inRT && notReceivingCount < 1) // need 1 free to receive
if in RT otherwise we don't care
return true;
else
return false;
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -w -r1.439 -r1.440
--- Version.java 15 Oct 2003 00:48:37 -0000 1.439
+++ Version.java 15 Oct 2003 01:57:55 -0000 1.440
@@ -18,7 +18,7 @@
public static String protocolVersion = "1.46";
/** The build number of the current revision */
- public static final int buildNumber = 6246;
+ public static final int buildNumber = 6247;
// 6028: may 3; ARK retrieval fix
public static final int ignoreBuildsAfter = 6500;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
