Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv25229/src/freenet/node/rt
Modified Files:
NGRouting.java NodeEstimator.java TerminatableRouting.java
Log Message:
don't show RT histogram if not using CPAlgoRT. Fix caption on successful inserts page.
Implement log rotation with optional compression using external native gzip. Logging.
New diags insertRoutingSuccessRatio, insertNonRoutingSuccessRatio,
insertFailRoutingNonRoutingRatio. Improved toString() on some objects. Ignore
QueryRejected.hopsToLive - use hopsToLive/2. Give StoreData a much longer timeout when
we go to AWSD from an insert.
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NGRouting.java 30 Aug 2003 23:16:52 -0000 1.2
+++ NGRouting.java 2 Sep 2003 17:05:22 -0000 1.3
@@ -58,6 +58,8 @@
return null;
}
last = list[at].ne;
+ Core.logger.log(this, toString()+".getNextRoute() iteration "+
+ count+" got "+last, Logger.DEBUG);
at++;
count++;
lastTime = System.currentTimeMillis();
@@ -185,12 +187,27 @@
protected void reallyTerminate(boolean success, boolean routingRelated) {
super.reallyTerminate(success, routingRelated);
+ if(logDEBUG)
+ Core.logger.log(this, "reallyTerminating("+success+","+
+ routingRelated+") "+toString(), Logger.DEBUG);
desperate = true;
count = maxSteps+1;
at = list.length;
long t = System.currentTimeMillis()-origStartTime;
- if(routingRelated)
+ if(routingRelated) {
ngrt.globalEstimator.reportTime(key, t);
+ }
+ if(isInsert) {
+ if(routingRelated)
+ Core.diagnostics.occurrenceBinomial("insertRoutingSuccessRatio",
+ 1, (success?1:0));
+ else
+ Core.diagnostics.occurrenceBinomial("insertNonRoutingSuccessRatio",
+ 1, (success?1:0));
+ if(!success)
+ Core.diagnostics.occurrenceBinomial("insertFailRoutingNonRoutingRatio",
+ 1, (routingRelated ? 1:0));
+ }
}
public void dataNotFound(int htl) {
@@ -201,6 +218,6 @@
}
public String toString() {
- return super.toString() + " ("+key+")";
+ return super.toString() + " ("+key+","+(isInsert?"insert":"request")+")";
}
}
Index: NodeEstimator.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NodeEstimator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeEstimator.java 30 Aug 2003 23:16:52 -0000 1.2
+++ NodeEstimator.java 2 Sep 2003 17:05:22 -0000 1.3
@@ -37,6 +37,10 @@
abstract public long estimate(Key k, int htl, long size,
double
requestFailTime, double pLegitDNF);
+ public String toString() {
+ return super.toString()+": "+ref;
+ }
+
/**
* @return the probability of DataNotFound, given that
* the other failure modes do not happen
Index: TerminatableRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TerminatableRouting.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TerminatableRouting.java 30 Aug 2003 23:16:52 -0000 1.2
+++ TerminatableRouting.java 2 Sep 2003 17:05:22 -0000 1.3
@@ -16,6 +16,8 @@
}
protected void reallyTerminate(boolean success, boolean routingRelated) {
+ Core.logger.log(this, "reallyTerminate("+success+","+routingRelated+") for
"+this,
+ new Exception("debug"), Logger.DEBUG);
Core.diagnostics.occurrenceBinomial("requestSuccessRatio", 1,
success ? 1 : 0);
if(!success)
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
