Author: nextgens
Date: 2009-01-30 12:29:54 +0000 (Fri, 30 Jan 2009)
New Revision: 25392
Modified:
trunk/freenet/src/freenet/crypt/Yarrow.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PacketTracker.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
Log:
more logging related improvments
Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2009-01-30 11:50:28 UTC (rev
25391)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2009-01-30 12:29:54 UTC (rev
25392)
@@ -23,6 +23,7 @@
import java.util.Properties;
import freenet.support.Logger;
+import freenet.support.LogThresholdCallback;
import freenet.support.io.Closer;
/**
@@ -52,6 +53,15 @@
public class Yarrow extends RandomSource {
private static final long serialVersionUID = -1;
+ private static volatile boolean logMINOR;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
/**
* Security parameters
*/
@@ -535,7 +545,6 @@
if(performedPoolReseed && (seedfile != null)) {
//Dont do this while synchronized on 'this' since
//opening a file seems to be suprisingly slow on windows
- boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR)
Logger.minor(this, "Writing seedfile");
write_seed(seedfile);
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-01-30 11:50:28 UTC (rev
25391)
+++ trunk/freenet/src/freenet/node/Node.java 2009-01-30 12:29:54 UTC (rev
25392)
@@ -111,6 +111,7 @@
import freenet.support.LRUHashtable;
import freenet.support.LRUQueue;
import freenet.support.Logger;
+import freenet.support.LogThresholdCallback;
import freenet.support.OOMHandler;
import freenet.support.PooledExecutor;
import freenet.support.ShortBuffer;
@@ -132,8 +133,15 @@
*/
public class Node implements TimeSkewDetectorCallback, GetPubkey {
- private static boolean logMINOR;
-
+ private static volatile boolean logMINOR;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
private static MeaningfulNodeNameUserAlert nodeNameUserAlert;
private static BuildOldAgeUserAlert buildOldAgeUserAlert;
private static TimeSkewDetectedUserAlert timeSkewDetectedUserAlert;
@@ -638,7 +646,6 @@
*/
Node(PersistentConfig config, RandomSource r, RandomSource weakRandom,
LoggingConfigHandler lc, NodeStarter ns, Executor executor) throws
NodeInitException {
// Easy stuff
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
String tmp = "Initializing Node using Freenet Build
#"+Version.buildNumber()+" r"+Version.cvsRevision+" and freenet-ext Build
#"+NodeStarter.extBuildNumber+" r"+NodeStarter.extRevisionNumber+" with
"+System.getProperty("java.vendor")+" JVM version
"+System.getProperty("java.version")+" running on
"+System.getProperty("os.arch")+' '+System.getProperty("os.name")+'
'+System.getProperty("os.version");
Logger.normal(this, tmp);
System.out.println(tmp);
@@ -2374,7 +2381,6 @@
* RequestSender.
*/
public Object makeRequestSender(Key key, short htl, long uid, PeerNode
source, boolean localOnly, boolean cache, boolean ignoreStore, boolean
offersOnly) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "makeRequestSender("+key+ ','
+htl+ ',' +uid+ ',' +source+") on "+getDarknetPortNumber());
// In store?
KeyBlock chk = null;
@@ -2792,7 +2798,6 @@
*/
public CHKInsertSender makeInsertSender(NodeCHK key, short htl, long
uid, PeerNode source,
byte[] headers, PartiallyReceivedBlock prb, boolean
fromStore, boolean cache) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "makeInsertSender("+key+ ','
+htl+ ',' +uid+ ',' +source+",...,"+fromStore);
KeyHTLPair kh = new KeyHTLPair(key, htl, uid);
CHKInsertSender is = null;
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2009-01-30 11:50:28 UTC
(rev 25391)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2009-01-30 12:29:54 UTC
(rev 25392)
@@ -19,6 +19,7 @@
import freenet.keys.NodeSSK;
import freenet.support.Fields;
import freenet.support.Logger;
+import freenet.support.LogThresholdCallback;
import freenet.support.ShortBuffer;
/**
@@ -38,7 +39,18 @@
*/
public class NodeDispatcher implements Dispatcher, Runnable {
- private static 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);
+ }
+ });
+ }
+
final Node node;
private NodeStats nodeStats;
private NodeDispatcherCallback callback;
@@ -49,7 +61,6 @@
NodeDispatcher(Node node) {
this.node = node;
this.nodeStats = node.nodeStats;
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
node.getTicker().queueTimedJob(this, STALE_CONTEXT_CHECK);
}
@@ -74,7 +85,6 @@
}
public boolean handleMessage(Message m) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
PeerNode source = (PeerNode)m.getSource();
if(source == null) {
// Node has been disconnected and garbage collected
already! Ouch.
@@ -178,7 +188,7 @@
}
if(!source.isRoutable()) return false;
- if(Logger.shouldLog(Logger.DEBUG, this)) Logger.debug(this,
"Not routable");
+ if(logDEBUG) Logger.debug(this, "Not routable");
if(spec == DMT.FNPNetworkID) {
source.handleFNPNetworkID(m);
@@ -825,4 +835,4 @@
public void setHook(NodeDispatcherCallback cb) {
this.callback = cb;
}
-}
\ No newline at end of file
+}
Modified: trunk/freenet/src/freenet/node/PacketTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketTracker.java 2009-01-30 11:50:28 UTC
(rev 25391)
+++ trunk/freenet/src/freenet/node/PacketTracker.java 2009-01-30 12:29:54 UTC
(rev 25392)
@@ -18,6 +18,7 @@
import freenet.support.LimitedRangeIntByteArrayMap;
import freenet.support.LimitedRangeIntByteArrayMapElement;
import freenet.support.Logger;
+import freenet.support.LogThresholdCallback;
import freenet.support.ReceivedPacketNumbers;
import freenet.support.TimeUtil;
import freenet.support.UpdatableSortedLinkedListItem;
@@ -34,7 +35,16 @@
*/
public class PacketTracker {
- private static boolean logMINOR;
+ private static volatile boolean logMINOR;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
+
/** Parent PeerNode */
public final PeerNode pn;
/** Are we the secondary key? */
@@ -101,7 +111,6 @@
isDeprecated = false;
nextPacketNumber = pn.node.random.nextInt(100 * 1000);
createdTime = System.currentTimeMillis();
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
/**
@@ -113,7 +122,6 @@
* packet number. However, old resend requests etc may still be sent.
*/
public void deprecated() {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Deprecated: "+this);
isDeprecated = true;
sentPacketsContents.interrupt();
@@ -361,7 +369,6 @@
*/
public synchronized void receivedPacket(int seqNumber) {
timeLastDecodedPacket = System.currentTimeMillis();
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR)
Logger.minor(this, "Received packet " + seqNumber + "
from " + pn.shortToString());
if(seqNumber == -1)
@@ -548,7 +555,6 @@
* @param realSeqNo
*/
public void acknowledgedPacket(int realSeqNo) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
AsyncMessageCallback[] callbacks;
if(logMINOR)
Logger.minor(this, "Acknowledged packet: " + realSeqNo);
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2009-01-30 11:50:28 UTC (rev 25391)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2009-01-30 12:29:54 UTC (rev 25392)
@@ -13,6 +13,7 @@
import freenet.support.HexUtil;
import freenet.support.Logger;
+import freenet.support.LogThresholdCallback;
import freenet.support.api.BucketFactory;
import freenet.support.io.Closer;
import freenet.support.io.FileUtil;
@@ -62,15 +63,21 @@
final BucketFactory bf;
final HashMap<String, ClientRequest> requestsByIdentifier;
protected final String connectionIdentifier;
- static boolean logMINOR;
+ private static volatile boolean logMINOR;
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
// We are confident that the given client can access those
private final HashMap<String, DirectoryAccess> checkedDirectories = new
HashMap<String, DirectoryAccess>();
// DDACheckJobs in flight
private final HashMap<File, DDACheckJob> inTestDirectories = new
HashMap<File, DDACheckJob>();
public FCPConnectionHandler(Socket s, FCPServer server) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.sock = s;
this.server = server;
isClosed = false;
@@ -146,7 +153,7 @@
public void setClientName(String name) {
this.clientName = name;
client = server.registerClient(name, server.core, this);
- if(Logger.shouldLog(Logger.MINOR, this))
+ if(logMINOR)
Logger.minor(this, "Set client name: "+name);
}
@@ -196,7 +203,7 @@
}
public void startClientPut(ClientPutMessage message) {
- if(Logger.shouldLog(Logger.MINOR, this))
+ if(logMINOR)
Logger.minor(this, "Starting insert
ID=\""+message.identifier+ '"');
String id = message.identifier;
ClientPut cp = null;
@@ -249,7 +256,7 @@
}
public void startClientPutDir(ClientPutDirMessage message,
HashMap<String, Object> buckets, boolean wasDiskPut) {
- if(Logger.shouldLog(Logger.MINOR, this))
+ if(logMINOR)
Logger.minor(this, "Start ClientPutDir");
String id = message.identifier;
ClientPutDir cp = null;
@@ -295,7 +302,7 @@
if(cp.isPersistentForever())
server.forceStorePersistentRequests();
}
- if(Logger.shouldLog(Logger.MINOR, this))
+ if(logMINOR)
Logger.minor(this, "Starting "+cp);
cp.start();
}
Modified: trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
===================================================================
--- trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
2009-01-30 11:50:28 UTC (rev 25391)
+++ trunk/freenet/src/freenet/support/LimitedRangeIntByteArrayMap.java
2009-01-30 12:29:54 UTC (rev 25392)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Iterator;
+import freenet.support.LogThresholdCallback;
import freenet.io.comm.AsyncMessageCallback;
/**
@@ -17,7 +18,15 @@
*/
public class LimitedRangeIntByteArrayMap {
- private static boolean logMINOR;
+ private static volatile boolean logMINOR;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
private final HashMap<Integer, LimitedRangeIntByteArrayMapElement>
contents;
private int minValue;
private int maxValue;
@@ -31,7 +40,6 @@
minValue = -1;
maxValue = -1;
flag = false;
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
public synchronized int minValue() {
@@ -87,7 +95,6 @@
* of range.
*/
public synchronized boolean add(int index, byte[] data,
AsyncMessageCallback[] callbacks, short priority) {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, toString()+" add "+index);
if(maxValue == -1) {
minValue = index;
Modified: trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
===================================================================
--- trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
2009-01-30 11:50:28 UTC (rev 25391)
+++ trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
2009-01-30 12:29:54 UTC (rev 25392)
@@ -14,17 +14,23 @@
public class UpdatableSortedLinkedList implements Iterable {
boolean debug = false;
protected boolean killed = false;
- private static boolean logMINOR;
+ private static volatile boolean logMINOR;
+
+ static {
+ Logger.registerLogThresholdCallback(new LogThresholdCallback(){
+ public void shouldUpdate(){
+ logMINOR = Logger.shouldLog(Logger.MINOR, this);
+ }
+ });
+ }
public UpdatableSortedLinkedList() {
list = new DoublyLinkedListImpl();
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
private final DoublyLinkedList list;
public synchronized void add(UpdatableSortedLinkedListItem i) throws
UpdatableSortedLinkedListKilledException {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(killed) throw new UpdatableSortedLinkedListKilledException();
if(logMINOR) Logger.minor(this, "Add("+i+") on "+this);
if(list.isEmpty()) {
@@ -84,7 +90,6 @@
}
public synchronized UpdatableSortedLinkedListItem
remove(UpdatableSortedLinkedListItem i) throws
UpdatableSortedLinkedListKilledException {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(killed) throw new UpdatableSortedLinkedListKilledException();
if(logMINOR) Logger.minor(this, "Remove("+i+") on "+this);
checkList();
@@ -104,7 +109,6 @@
}
public synchronized void update(UpdatableSortedLinkedListItem i) throws
UpdatableSortedLinkedListKilledException {
- logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(killed) throw new UpdatableSortedLinkedListKilledException();
if(logMINOR) Logger.minor(this, "Update("+i+") on "+this);
checkList();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
