Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv25547/src/freenet/node/rt
Modified Files:
NGRouting.java TerminatableRouting.java TreeRouting.java
TreeRoutingTable.java
Log Message:
6302: Add new diagnostic routingSuccessRatioCHK.
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- NGRouting.java 3 Nov 2003 18:52:50 -0000 1.18
+++ NGRouting.java 4 Nov 2003 01:24:25 -0000 1.19
@@ -33,6 +33,7 @@
NGRouting(NGRoutingTable ngrt, Estimate[] list, int maxSteps, Key k,
boolean doDesperate, Node n, boolean isInsert) {
+ super(k);
origStartTime = System.currentTimeMillis();
this.list = list;
last = null;
Index: TerminatableRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TerminatableRouting.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- TerminatableRouting.java 18 Oct 2003 18:55:22 -0000 1.6
+++ TerminatableRouting.java 4 Nov 2003 01:24:25 -0000 1.7
@@ -2,6 +2,8 @@
package freenet.node.rt;
import freenet.Core;
+import freenet.Key;
+import freenet.keys.CHK;
import freenet.support.Logger;
/**
@@ -12,6 +14,11 @@
public abstract class TerminatableRouting implements Routing {
boolean terminated = false;
boolean noDiag = false;
+ Key k;
+
+ public TerminatableRouting(Key k) {
+ this.k = k;
+ }
public void terminate(boolean success, boolean routingRelated) {
if(terminated) return;
@@ -32,19 +39,23 @@
if(logDEBUG) Core.logger.log(this, "reallyTerminate("+success+","+
routingRelated+") for "+this,
new
Exception("debug"), Logger.DEBUG);
- staticReallyTerminate(success, routingRelated);
+ staticReallyTerminate(success, routingRelated, k);
}
public static void staticReallyTerminate(boolean success,
-
boolean routingRelated) {
+
boolean routingRelated, Key k) {
Core.diagnostics.occurrenceBinomial("requestSuccessRatio", 1,
success ? 1 : 0);
if(!success)
Core.diagnostics.occurrenceBinomial("requestFailureRoutingOrNotRatio",1,
routingRelated ? 1 : 0);
- if(routingRelated)
+ if(routingRelated) {
Core.diagnostics.occurrenceBinomial("routingSuccessRatio",1,
success ? 1 : 0);
+ if(k instanceof CHK)
+ Core.diagnostics.occurrenceBinomial("routingSuccessRatioCHK",
1,
+ success ? 1:0);
+ }
}
protected void finalize() {
Index: TreeRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRouting.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- TreeRouting.java 1 Nov 2003 22:35:34 -0000 1.30
+++ TreeRouting.java 4 Nov 2003 01:24:25 -0000 1.31
@@ -4,6 +4,7 @@
import freenet.Core;
import freenet.Identity;
+import freenet.Key;
import freenet.node.NodeReference;
import freenet.support.Logger;
import freenet.support.MetricWalk;
@@ -36,7 +37,8 @@
protected boolean logDEBUG = false;
TreeRouting(TreeRoutingTable rt, MetricWalk refWalk,
- freenet.node.Node n, boolean doDesperate) {
+ freenet.node.Node n, boolean doDesperate, Key k) {
+ super(k);
this.rt = rt;
this.refWalk = refWalk;
this.backupWalk = (MetricWalk)refWalk.clone();
Index: TreeRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRoutingTable.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- TreeRoutingTable.java 30 Oct 2003 01:34:06 -0000 1.28
+++ TreeRoutingTable.java 4 Nov 2003 01:24:25 -0000 1.29
@@ -134,7 +134,7 @@
}
TreeRouting r = new TreeRouting(this, w,
freenet.node.Main.node /*FIXME!*/,
- doDesperate);
+ doDesperate, k);
if((length > 500 && logMINOR) || logDEBUG)
Core.logger.log(this, "route("+k+","+doDesperate+
") locked RT for "+length+" at "+y,
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
