Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv11501/src/freenet/node/rt
Modified Files:
NGRouting.java StandardNodeEstimator.java TreeRouting.java
Log Message:
6217:
Implement PeerHandler. Web interface works. FCP does not work. Probably has
significant bugs. This is unstable after all... and others may want to look at it.
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NGRouting.java 3 Oct 2003 02:48:42 -0000 1.7
+++ NGRouting.java 4 Oct 2003 01:16:56 -0000 1.8
@@ -78,15 +78,15 @@
if(logDEBUG)
node.logger.log(this, "Checking for free conn...", Logger.DEBUG);
long start = System.currentTimeMillis();
- boolean ret = (node.connections.findFreeConnection(id) != null);
- if(!ret)
+ boolean ret = (node.connections.needsConnection(id));
+ if(ret)
node.scheduleConnectionOpener(id);
long end = System.currentTimeMillis();
if(logDEBUG)
node.logger.log(this, "Checking for free conn for "+id+
" took "+(end-start)+" for "+this+", result="+
- ret, Logger.DEBUG);
- return ret;
+ !ret, Logger.DEBUG);
+ return !ret;
}
public void ignoreRoute() {
Index: StandardNodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/StandardNodeEstimator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardNodeEstimator.java 1 Oct 2003 02:02:26 -0000 1.5
+++ StandardNodeEstimator.java 4 Oct 2003 01:16:56 -0000 1.6
@@ -17,8 +17,8 @@
class StandardNodeEstimator extends NodeEstimator {
// Apologies for the notation, but read the estimator function!
- RunningAverage rpConnectFailed, /*rpQueryRejected,*/ rpTransferFailed,
rpSearchFailed;
- RunningAverage rtConnectFailed, rtConnected, /*rtQueryRejected,*/
rtTransferFailed, rtSearchFailed, rpDNF;
+ RunningAverage rpConnectFailed, rpTransferFailed, rpSearchFailed;
+ RunningAverage rtConnectFailed, rtConnected, rtTransferFailed, rtSearchFailed,
rpDNF;
TimeEstimator etSuccessSearch, etTransferRate;
TimeEstimator epDNFGivenConnectionAndNotRejectedOrSearchFailed, etDNF;
static final int T_SUCCESS_SEARCH = 0;
@@ -56,13 +56,11 @@
int version = dis.readInt();
if(version != 1) throw new IOException("Unrecognized version
"+version);
rpConnectFailed = raf.create(dis);
- //rpQueryRejected = raf.create(dis);
rpTransferFailed = raf.create(dis);
rpSearchFailed = raf.create(dis);
rpDNF = raf.create(dis);
rtConnectFailed = raf.create(dis);
rtConnected = raf.create(dis);
-// rtQueryRejected = raf.create(dis);
rtTransferFailed = raf.create(dis);
rtSearchFailed = raf.create(dis);
Core.logger.log(this, "Serialized in all RunningAverage's",
@@ -103,14 +101,12 @@
this.mem = mem;
// Set all the failure probabilities to 0
rpConnectFailed = raf.create(0);
-// rpQueryRejected = raf.create(0);
rpTransferFailed = raf.create(0);
rpSearchFailed = raf.create(0);
rpDNF = raf.create(0);
// Set all the failure times to 0 too. It will learn soon enough.
rtConnectFailed = raf.create(0);
rtConnected = raf.create(0);
-// rtQueryRejected = raf.create(0);
rtTransferFailed = raf.create(0);
rtSearchFailed = raf.create(0);
// Now the RTEs
@@ -138,11 +134,8 @@
// First the simple failures
// would it be better just to remove the connectionFailed stuff... edt
double pConnectFailed = needConnection ?
rpConnectFailed.currentValue() : 0;
-// double pQueryRejected = rpQueryRejected.currentValue();
double tConnectFailed = needConnection ?
rtConnectFailed.currentValue() : 0;
-// double tQueryRejected = rtQueryRejected.currentValue();
estimate = (pConnectFailed * (tConnectFailed + requestFailTime));
-// + (pQueryRejected * (tQueryRejected + requestFailTime));
double pSearchFailed = rpSearchFailed.currentValue();
double tSearchFailed = rtSearchFailed.currentValue();
double pTransferFailed = rpTransferFailed.currentValue();
@@ -266,13 +259,11 @@
public int getDataLength() {
return rpConnectFailed.getDataLength() +
-// rpQueryRejected.getDataLength() +
rpTransferFailed.getDataLength() +
rpSearchFailed.getDataLength() +
rpDNF.getDataLength() +
rtConnectFailed.getDataLength() +
rtConnected.getDataLength() +
-// rtQueryRejected.getDataLength() +
rtTransferFailed.getDataLength() +
rtSearchFailed.getDataLength() +
etSuccessSearch.getDataLength() +
@@ -428,13 +419,11 @@
public void writeTo(DataOutputStream out) throws IOException {
out.writeInt(1); // version number
rpConnectFailed.writeTo(out);
-// rpQueryRejected.writeTo(out);
rpTransferFailed.writeTo(out);
rpSearchFailed.writeTo(out);
rpDNF.writeTo(out);
rtConnectFailed.writeTo(out);
rtConnected.writeTo(out);
-// rtQueryRejected.writeTo(out);
rtTransferFailed.writeTo(out);
rtSearchFailed.writeTo(out);
etSuccessSearch.writeTo(out);
Index: TreeRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRouting.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- TreeRouting.java 18 Sep 2003 17:48:10 -0000 1.25
+++ TreeRouting.java 4 Oct 2003 01:16:57 -0000 1.26
@@ -201,7 +201,7 @@
if(logDEBUG)
Core.logger.log(this, "Checking for free conn...", Logger.DEBUG);
long start = System.currentTimeMillis();
- boolean ret = (node.connections.findFreeConnection(id) != null);
+ boolean ret = (node.connections.needsConnection(id));
long end = System.currentTimeMillis();
if(logDEBUG)
Core.logger.log(this, "Checking for free conn took "+(end-start)+
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
