Author: nextgens
Date: 2009-01-29 17:36:06 +0000 (Thu, 29 Jan 2009)
New Revision: 25371
Modified:
trunk/freenet/src/freenet/node/NodeStats.java
Log:
same thing for NodeStats
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2009-01-29 17:30:10 UTC
(rev 25370)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2009-01-29 17:36:06 UTC
(rev 25371)
@@ -13,6 +13,7 @@
import freenet.node.SecurityLevels.NETWORK_THREAT_LEVEL;
import freenet.support.HTMLNode;
import freenet.support.Logger;
+import freenet.support.LogThresholdCallback;
import freenet.support.SimpleFieldSet;
import freenet.support.StringCounter;
import freenet.support.TimeUtil;
@@ -67,7 +68,17 @@
final RandomSource hardRandom;
- private boolean logMINOR;
+ private static volatile boolean logMINOR;
+ private static volatile boolean logDEBUG;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
+ }
+ });
+ }
/** first time bwlimitDelay was over PeerManagerUserAlert threshold */
private long firstBwlimitDelayTimeThresholdBreak ;
@@ -192,7 +203,6 @@
private static final long peerManagerUserAlertStatsUpdateInterval =
1000; // 1 second
NodeStats(Node node, int sortOrder, SubConfig statsConfig, int
obwLimit, int ibwLimit, File nodeDir) throws NodeInitException {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.node = node;
this.peers = node.peers;
this.hardRandom = node.random;
@@ -442,7 +452,6 @@
/* return reject reason as string if should reject, otherwise return
null */
public String shouldRejectRequest(boolean canAcceptAnyway, boolean
isInsert, boolean isSSK, boolean isLocal, boolean isOfferReply, PeerNode
source) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) dumpByteCostAverages();
int threadCount = getActiveThreadCount();
@@ -929,7 +938,7 @@
} else {
nodeAveragePingAlertRelevant = false;
}
- if(logMINOR && Logger.shouldLog(Logger.DEBUG, this))
Logger.debug(this, "mUPMUAS: "+now+": "+getBwlimitDelayTime()+" >?
"+MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD+" since
"+firstBwlimitDelayTimeThresholdBreak+" ("+bwlimitDelayAlertRelevant+")
"+getNodeAveragePingTime()+" >? "+MAX_NODE_AVERAGE_PING_TIME_ALERT_THRESHOLD+"
since "+firstNodeAveragePingTimeThresholdBreak+"
("+nodeAveragePingAlertRelevant+ ')');
+ if(logDEBUG) Logger.debug(this, "mUPMUAS: "+now+":
"+getBwlimitDelayTime()+" >? "+MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD+" since
"+firstBwlimitDelayTimeThresholdBreak+" ("+bwlimitDelayAlertRelevant+")
"+getNodeAveragePingTime()+" >? "+MAX_NODE_AVERAGE_PING_TIME_ALERT_THRESHOLD+"
since "+firstNodeAveragePingTimeThresholdBreak+"
("+nodeAveragePingAlertRelevant+ ')');
nextPeerManagerUserAlertStatsUpdateTime = now +
peerManagerUserAlertStatsUpdateInterval;
}
}
@@ -1366,7 +1375,7 @@
}
public synchronized void insertSentBytes(boolean ssk, int x) {
- if(Logger.shouldLog(Logger.DEBUG, this))
+ if(logDEBUG)
Logger.debug(this, "insertSentBytes("+ssk+", "+x+")");
if(ssk)
sskInsertSentBytes += x;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
