Here is a patch for some places where Freenet is calling the logging function 
when it might not need to.
Only in freenet: DebugLogDetector2.sh
Only in freenet: Logging.diff
diff -b -r freenet.bak/src/freenet/fs/dir/FSDataObjectStore.java freenet/src/freenet/fs/dir/FSDataObjectStore.java
144c144,145
< 	else Core.logger.log(this, key.toString()+" not in dataObjects",
---
> 	else if(Core.logger.shouldLog(Core.logger.DEBUG))
> 		Core.logger.log(this, key.toString()+" not in dataObjects",
147c148,149
< 	else Core.logger.log(this, key.toString()+" not in outputQueue",
---
> 	else if(Core.logger.shouldLog(Core.logger.DEBUG))
> 		Core.logger.log(this, key.toString()+" not in outputQueue",
150c152,153
< 	else Core.logger.log(this, key.toString()+" not in underlying Dir",
---
> 	else if(Core.logger.shouldLog(Core.logger.DEBUG))
> 		Core.logger.log(this, key.toString()+" not in underlying Dir",
diff -b -r freenet.bak/src/freenet/fs/dir/NativeFSDirectory.java freenet/src/freenet/fs/dir/NativeFSDirectory.java
421c421
<                 Core.logger.log(this, "Begin reading directories", Core.logger.DEBUG);
---
>                 if(logDEBUG) Core.logger.log(this, "Begin reading directories", Core.logger.DEBUG);
432c432
<             Core.logger.log(this, "Attempting to recover " + f.length + " files from temp directory", Core.logger.DEBUG);
---
>             if(logDEBUG) Core.logger.log(this, "Attempting to recover " + f.length + " files from temp directory", Core.logger.DEBUG);
479c479
<                                 Core.logger.log(this, "Read "+c+"%",Core.logger.DEBUG);
---
>                                 if(logDEBUG) Core.logger.log(this, "Read "+c+"%",Core.logger.DEBUG);
696c696
<         Core.logger.log(this, "Currently used memory (starting NativeFSDirectory): "+(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()), Core.logger.DEBUG);
---
>         if(logDEBUG) Core.logger.log(this, "Currently used memory (starting NativeFSDirectory): "+(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()), Core.logger.DEBUG);
745c745
<                     Core.logger.log(this, "Inserted "+x, Core.logger.DEBUG);
---
>                     if(logDEBUG) Core.logger.log(this, "Inserted "+x, Core.logger.DEBUG);
766c766
<                                 Core.logger.log(this, "Preloaded "+c+"%", Core.logger.DEBUG);
---
>                                 if(logDEBUG) Core.logger.log(this, "Preloaded "+c+"%", Core.logger.DEBUG);
795c795
<         Core.logger.log(this, "Currently used memory (started NativeFSDirectory, "+buffers.size()+" keys): "+(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()), Core.logger.DEBUG);
---
>         if(logDEBUG) Core.logger.log(this, "Currently used memory (started NativeFSDirectory, "+buffers.size()+" keys): "+(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()), Core.logger.DEBUG);
804c804
<         Core.logger.log(this, "Currently used memory (started NativeFSDirectory, after GC, "+buffers.size()+" keys): "+(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()), Core.logger.DEBUG);
---
>         if(logDEBUG) Core.logger.log(this, "Currently used memory (started NativeFSDirectory, after GC, "+buffers.size()+" keys): "+(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()), Core.logger.DEBUG);
814c814
<         Core.logger.log(this, "clearWrite("+curLength+","+finalLength+")",
---
>         if(logDEBUG) Core.logger.log(this, "clearWrite("+curLength+","+finalLength+")",
1195c1195
<                 Core.logger.log(this, "Not deleting "+fn+": usedSinceCommit="+
---
>                 if(logDEBUG) Core.logger.log(this, "Not deleting "+fn+": usedSinceCommit="+
1462,1464c1462,1463
<             long x = System.currentTimeMillis();
<             Core.logger.log(this, "Checkpointing NativeFSDirectory at "+
<                             x, Core.logger.DEBUG);
---
> 	    if(logDEBUG) Core.logger.log(this, "Checkpointing NativeFSDirectory at "+
>                             time, Core.logger.DEBUG);
1466,1467c1465,1466
<             Core.logger.log(this, "Checkpointed NativeFSDirectory, took "+
<                             (System.currentTimeMillis() - x), 
---
>             if(logDEBUG) Core.logger.log(this, "Checkpointed NativeFSDirectory, took "+
>                             (System.currentTimeMillis() - time),
diff -b -r freenet.bak/src/freenet/node/ds/FSDataStoreElement.java freenet/src/freenet/node/ds/FSDataStoreElement.java
32a33
> 	if(Core.logger.shouldLog(Core.logger.DEBUG))
diff -b -r freenet.bak/src/freenet/node/rt/DataObjectRoutingMemory.java freenet/src/freenet/node/rt/DataObjectRoutingMemory.java
69a70
> 	if(Core.logger.shouldLog(Core.logger.DEBUG))
diff -b -r freenet.bak/src/freenet/node/rt/DataObjectRoutingStore.java freenet/src/freenet/node/rt/DataObjectRoutingStore.java
114a115
> 	if(Core.logger.shouldLog(Core.logger.DEBUG))
diff -b -r freenet.bak/src/freenet/node/rt/TreeRouting.java freenet/src/freenet/node/rt/TreeRouting.java
48c48
< 	Core.logger.log(this, "Created TreeRouting at "+System.currentTimeMillis()+
---
> 	if (logDEBUG) Core.logger.log(this, "Created TreeRouting at "+System.currentTimeMillis()+
diff -b -r freenet.bak/src/freenet/node/rt/TreeRoutingTable.java freenet/src/freenet/node/rt/TreeRoutingTable.java
91,92c91,93
< 	long end = System.currentTimeMillis();
< 	long length = end-now;
---
> 	if(Core.logger.shouldLog(Core.logger.MINOR))
> 	{
> 		long length = System.currentTimeMillis()-now;
96a98
>     }
102a105,106
>     	if(Core.logger.shouldLog(Core.logger.MINOR))
> 	{
106a111
> 	}
108a114,115
> 	if(Core.logger.shouldLog(Core.logger.MINOR))
> 	{
111a119
> 	}
114a123,124
> 	if(Core.logger.shouldLog(Core.logger.MINOR))
> 	{
118a129
> 	}
diff -b -r freenet.bak/src/freenet/transport/tcpAddress.java freenet/src/freenet/transport/tcpAddress.java
105c105
< 	    long endTime = System.currentTimeMillis();
---
> 	    if(Core.logger.shouldLog(Core.logger.DEBUG)) {
107c107,108
< 			    (endTime-startTime)+" ms", Core.logger.DEBUG);
---
> 			    (System.currentTimeMillis()-startTime)+" ms", Core.logger.DEBUG);
> 			    }
diff -b -r freenet.bak/src/freenet/transport/ThrottledSelectorLoop.java freenet/src/freenet/transport/ThrottledSelectorLoop.java
212c212
< 						Core.logger.log(this, "Invalid "+curKey+"("+curKey.channel()+","+curKey.attachment()+" on selector in throttleConnections, ignoring", Logger.DEBUG);
---
> 						if(logDEBUG) Core.logger.log(this, "Invalid "+curKey+"("+curKey.channel()+","+curKey.attachment()+" on selector in throttleConnections, ignoring", Logger.DEBUG);

Reply via email to