Author: toad
Date: 2009-01-12 23:14:18 +0000 (Mon, 12 Jan 2009)
New Revision: 25042
Modified:
trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/node/RequestSender.java
Log:
Don't record times to MedianMeanRunningAverage unless logMINOR is enabled
Modified: trunk/freenet/src/freenet/io/xfer/BlockReceiver.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2009-01-12
23:11:51 UTC (rev 25041)
+++ trunk/freenet/src/freenet/io/xfer/BlockReceiver.java 2009-01-12
23:14:18 UTC (rev 25042)
@@ -192,9 +192,11 @@
maybeResetDiscardFilter();
long endTime = System.currentTimeMillis();
long transferTime = (endTime - startTime);
- synchronized(avgTimeTaken) {
- avgTimeTaken.report(transferTime);
- Logger.minor(this, "Block transfer took
"+transferTime+"ms - average is "+avgTimeTaken);
+ if(logMINOR) {
+ synchronized(avgTimeTaken) {
+ avgTimeTaken.report(transferTime);
+ Logger.minor(this, "Block transfer took
"+transferTime+"ms - average is "+avgTimeTaken);
+ }
}
return _prb.getBlock();
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2009-01-12
23:11:51 UTC (rev 25041)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2009-01-12
23:14:18 UTC (rev 25042)
@@ -230,10 +230,12 @@
}
} else if
(msg.getSpec().equals(DMT.allReceived)) {
long endTime =
System.currentTimeMillis();
- long transferTime = (endTime -
startTime);
- synchronized(avgTimeTaken) {
-
avgTimeTaken.report(transferTime);
- Logger.minor(this, "Block send
took "+transferTime+" : "+avgTimeTaken);
+ if(logMINOR) {
+ long transferTime = (endTime -
startTime);
+ synchronized(avgTimeTaken) {
+
avgTimeTaken.report(transferTime);
+ Logger.minor(this,
"Block send took "+transferTime+" : "+avgTimeTaken);
+ }
}
return true;
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2009-01-12 23:11:51 UTC
(rev 25041)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2009-01-12 23:14:18 UTC
(rev 25042)
@@ -1081,7 +1081,7 @@
}
if(status == SUCCESS) {
- if(key instanceof NodeCHK && transferTime > 0) {
+ if(key instanceof NodeCHK && transferTime > 0 && logMINOR) {
long timeTaken = System.currentTimeMillis() - startTime;
synchronized(avgTimeTaken) {
avgTimeTaken.report(timeTaken);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
