Update of /cvsroot/freenet/freenet/src/freenet/node/rt
In directory sc8-pr-cvs1:/tmp/cvs-serv21851/src/freenet/node/rt
Modified Files:
NGRouting.java NGRoutingTable.java
Log Message:
6314:
Fix announcements to nodes not already known.
Fix descriptions for diff diagnostics vars.
Report diffTransferRate etc in bytes per second.
Logging
Index: NGRouting.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRouting.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- NGRouting.java 4 Nov 2003 20:29:18 -0000 1.21
+++ NGRouting.java 5 Nov 2003 22:36:39 -0000 1.22
@@ -202,15 +202,13 @@
Core.diagnostics.occurrenceContinuous("absDiffSearchSuccessTime",
Math.abs(diffSearchTime));
if(size > 16384) { // more than one segment
- double rate = ((double)size) / ((double)transferTime);
- double diffRate = rate - lastEstimate.transferRate;
+ double rate = ((double)size * 1000) / ((double)transferTime);
+ double diffRate = rate - (lastEstimate.transferRate*1000);
Core.diagnostics.occurrenceContinuous("diffTransferRate", diffRate);
Core.diagnostics.occurrenceContinuous("absDiffTransferRate",
Math.abs(diffRate));
ngrt.reportRate(rate);
- Core.diagnostics.occurrenceContinuous("successTransferRate",
- ((double)size*1000)/
- ((double)transferTime));
+ Core.diagnostics.occurrenceContinuous("successTransferRate", rate);
}
terminate(true, true);
}
Index: NGRoutingTable.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/rt/NGRoutingTable.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- NGRoutingTable.java 4 Nov 2003 23:00:43 -0000 1.28
+++ NGRoutingTable.java 5 Nov 2003 22:36:40 -0000 1.29
@@ -116,7 +116,7 @@
}
ne = factory.create(mem, ref, e, false);
} catch (IOException ex) {
- Core.logger.log(this, "Caught "+ex+"
deserializing a NodeEstimator for "+mem, Logger.ERROR);
+ Core.logger.log(this, "Caught "+ex+"
deserializing a NodeEstimator for "+mem, ex, Logger.ERROR);
ne = null;
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
