Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv25420/src/freenet/node/rt
Modified Files:
Tag: ngrouting
NGRouting.java TreeRouting.java
Log Message:
7042: Add diagnostics vars, logged in both routing modes, normalizedSuccessTime,
successSearchTime and successTransferRate
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/Attic/NGRouting.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- NGRouting.java 28 Aug 2003 00:55:54 -0000 1.1.2.10
+++ NGRouting.java 28 Aug 2003 01:33:25 -0000 1.1.2.11
@@ -159,9 +159,22 @@
public void transferSucceeded(long searchTime, int htl, long size,
long transferTime) {
last.transferSucceeded(key, searchTime, htl, size, transferTime);
+ long stdFileSize;
+ if(node.dir.countKeys() > 16)
+ stdFileSize = (node.storeSize - node.dir.available()) /
+ node.dir.countKeys();
+ else stdFileSize = 100000;
+ long normalizedTime = searchTime + (transferTime*stdFileSize/size);
+ Core.diagnostics.occurrenceContinuous("normalizedSucessTime",
+ normalizedTime);
+ Core.diagnostics.occurrenceContinuous("successSearchTime",
+ searchTime);
if(size > 16384) { // more than one segment
double rate = ((double)size) / ((double)transferTime);
ngrt.reportRate(rate);
+ Core.diagnostics.occurrenceContinuous("successTransferRate",
+ ((double)transferTime)/
+ ((double)size));
}
terminate(true);
}
Index: TreeRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/TreeRouting.java,v
retrieving revision 1.21.2.10
retrieving revision 1.21.2.11
diff -u -r1.21.2.10 -r1.21.2.11
--- TreeRouting.java 28 Aug 2003 00:55:54 -0000 1.21.2.10
+++ TreeRouting.java 28 Aug 2003 01:33:25 -0000 1.21.2.11
@@ -259,6 +259,20 @@
public void transferSucceeded(long time, int htl, long size, long etime) {
terminate(true);
+ long stdFileSize;
+ if(node.dir.countKeys() > 16)
+ stdFileSize = (node.storeSize - node.dir.available()) /
+ node.dir.countKeys();
+ else stdFileSize = 100000;
+ long normalizedTime = time + (etime*stdFileSize/size);
+ Core.diagnostics.occurrenceContinuous("normalizedSucessTime",
+ normalizedTime);
+ Core.diagnostics.occurrenceContinuous("successSearchTime",
+ time);
+ if(size > 16384)
+ Core.diagnostics.occurrenceContinuous("successTransferRate",
+ ((double)etime)/
+ ((double)size));
};
public void dataNotFound(int htl) {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
