Author: zothar
Date: 2007-08-28 01:26:17 +0000 (Tue, 28 Aug 2007)
New Revision: 14899
Modified:
trunk/freenet/src/freenet/client/FECCodec.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/io/NetworkInterface.java
trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/DNSRequester.java
trunk/freenet/src/freenet/node/GlobalProbe.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/InsertHandler.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/LoggingConfigHandler.java
trunk/freenet/src/freenet/node/MemoryChecker.java
trunk/freenet/src/freenet/node/NodePinger.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/Persister.java
trunk/freenet/src/freenet/node/RequestHandler.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/RequestStarter.java
trunk/freenet/src/freenet/node/SSKInsertHandler.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/TestnetStatusUploader.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/support/OSThread.java
trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
Log:
Add log target configurability to logPID()/logPPID(). Add calls to logPID()
throughout the code. Remove some code I had used while developing
logPID()/logPPID().
Modified: trunk/freenet/src/freenet/client/FECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/FECCodec.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/client/FECCodec.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -373,6 +373,7 @@
private static class FECRunner implements Runnable {
public void run(){
+ freenet.support.OSThread.logPID(this);
try {
while(true){
FECJob job = null;
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2007-08-28 00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2007-08-28 01:26:17 UTC (rev 14899)
@@ -114,6 +114,7 @@
private class OffThreadCompressor implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
tryCompress();
} catch (InsertException e) {
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2007-08-28 00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2007-08-28 01:26:17 UTC (rev 14899)
@@ -425,6 +425,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(logMINOR) Logger.minor(this, "Handling connection");
try {
Modified: trunk/freenet/src/freenet/io/NetworkInterface.java
===================================================================
--- trunk/freenet/src/freenet/io/NetworkInterface.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/io/NetworkInterface.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -277,6 +277,7 @@
* @see NetworkInterface#allowedHosts
*/
public void run() {
+ freenet.support.OSThread.logPID(this);
while (!closed) {
boolean logMINOR =
Logger.shouldLog(Logger.MINOR, this);
try {
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2007-08-28
00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2007-08-28
01:26:17 UTC (rev 14899)
@@ -274,6 +274,7 @@
public class USMChecker implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
if(_isDone) return; // don't synchronize
because don't want to deadlock - this is our recovery mechanism
logMINOR = Logger.shouldLog(Logger.MINOR,
UdpSocketHandler.this);
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -37,6 +37,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
bt.send(executor);
if(bt.failedDueToOverload()) {
@@ -199,6 +200,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
short origHTL;
synchronized (this) {
origHTL = htl;
@@ -637,6 +639,7 @@
private class CompletionWaiter implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
if(logMINOR) Logger.minor(this, "Starting "+this);
// Wait for the request to reach a terminal stage.
Modified: trunk/freenet/src/freenet/node/DNSRequester.java
===================================================================
--- trunk/freenet/src/freenet/node/DNSRequester.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/DNSRequester.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -30,6 +30,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
try {
realRun();
Modified: trunk/freenet/src/freenet/node/GlobalProbe.java
===================================================================
--- trunk/freenet/src/freenet/node/GlobalProbe.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/GlobalProbe.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -39,6 +39,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
synchronized(this) {
lastLocation = 0.0;
double prevLoc = lastLocation;
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-08-28
00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-08-28
01:26:17 UTC (rev 14899)
@@ -152,6 +152,7 @@
}
node.getTicker().queueTimedJob(new Runnable() {
public void run() {
+ freenet.support.OSThread.logPID(this);
tryMaybeRun();
}
}, 60*1000);
@@ -475,6 +476,7 @@
public class DetectorRunner implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
realRun();
} catch (OutOfMemoryError e) {
Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/InsertHandler.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -71,6 +71,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
realRun();
} catch (OutOfMemoryError e) {
@@ -400,6 +401,7 @@
public class DataReceiver implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
synchronized(this) {
receiveStarted = true;
}
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -144,6 +144,7 @@
public class SwapRequestSender implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
try {
long startTime = System.currentTimeMillis();
@@ -244,6 +245,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
MessageDigest md = SHA256.getMessageDigest();
boolean reachedEnd = false;
@@ -401,6 +403,7 @@
RecentlyForwardedItem item;
public void run() {
+ freenet.support.OSThread.logPID(this);
long uid = r.nextLong();
if(!lock()) return;
boolean reachedEnd = false;
Modified: trunk/freenet/src/freenet/node/LoggingConfigHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/LoggingConfigHandler.java 2007-08-28
00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/LoggingConfigHandler.java 2007-08-28
01:26:17 UTC (rev 14899)
@@ -302,6 +302,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
fileLoggerHook.waitForSwitch();
delete(logDir);
}
Modified: trunk/freenet/src/freenet/node/MemoryChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/MemoryChecker.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/MemoryChecker.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -32,6 +32,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
if(!goon){
Logger.normal(this, "Goon is false ; killing
MemoryChecker");
return;
Modified: trunk/freenet/src/freenet/node/NodePinger.java
===================================================================
--- trunk/freenet/src/freenet/node/NodePinger.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/NodePinger.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -32,6 +32,7 @@
final Node node;
public void run() {
+ //freenet.support.OSThread.logPID(this);
try {
recalculateMean(node.peers.connectedPeers);
} finally {
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -70,6 +70,7 @@
private class Watchdog implements Runnable {
public void run() {
+ freenet.support.OSThread.logPID(this);
// Do not lock anything, or we may be caught up with a
lost-lock deadlock.
while(true) {
try {
@@ -120,6 +121,7 @@
if(now < transition) {
queueTimedJob(new Runnable() {
public void run() {
+ freenet.support.OSThread.logPID(this);
PeerNode[] nodes = node.peers.myPeers;
for(int i=0;i<nodes.length;i++) {
PeerNode pn = nodes[i];
@@ -139,6 +141,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
lastReceivedPacketFromAnyNode = lastReportedNoPackets;
try {
Modified: trunk/freenet/src/freenet/node/Persister.java
===================================================================
--- trunk/freenet/src/freenet/node/Persister.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/Persister.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -41,6 +41,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
persistThrottle();
} catch (OutOfMemoryError e) {
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -73,6 +73,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
boolean thrown = false;
try {
realRun();
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -117,6 +117,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
if((key instanceof NodeSSK) && (pubKey == null)) {
pubKey = ((NodeSSK)key).getPubKey();
}
Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/RequestStarter.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -142,6 +142,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
try {
realRun();
@@ -162,6 +163,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
if(!req.send(core, sched))
Logger.normal(this, "run() not able to send a
request");
if(Logger.shouldLog(Logger.MINOR, this))
Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java 2007-08-28
00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java 2007-08-28
01:26:17 UTC (rev 14899)
@@ -75,6 +75,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
realRun();
} catch (OutOfMemoryError e) {
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -101,6 +101,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
short origHTL = htl;
node.addInsertSender(myKey, htl, this);
try {
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -75,6 +75,7 @@
private int testnetPort;
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true){
// Set up server socket
try {
@@ -128,6 +129,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
InputStream is = null;
OutputStream os = null;
Modified: trunk/freenet/src/freenet/node/TestnetStatusUploader.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetStatusUploader.java 2007-08-28
00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/TestnetStatusUploader.java 2007-08-28
01:26:17 UTC (rev 14899)
@@ -45,6 +45,7 @@
private Socket client;
public void run() {
+ freenet.support.OSThread.logPID(this);
//thread loop
while(true){
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2007-08-28
00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2007-08-28
01:26:17 UTC (rev 14899)
@@ -95,6 +95,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
realRun();
} catch (IOException e) {
@@ -337,6 +338,7 @@
// FIXME run on separate thread
n.ps.queueTimedJob(new Runnable() {
public void run() {
+ freenet.support.OSThread.logPID(this);
n.getNodeUpdater().arm();
}
}, 0);
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2007-08-28 00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2007-08-28 01:26:17 UTC (rev 14899)
@@ -208,6 +208,7 @@
* Read commands, run them
*/
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
int curPort = port;
String tempBindTo = this.bindTo;
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
2007-08-28 00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
2007-08-28 01:26:17 UTC (rev 14899)
@@ -27,6 +27,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
realRun();
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
2007-08-28 00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
2007-08-28 01:26:17 UTC (rev 14899)
@@ -26,6 +26,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
try {
realRun();
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -151,6 +151,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
try {
realRun();
@@ -525,6 +526,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
long startTime = System.currentTimeMillis();
try {
Modified: trunk/freenet/src/freenet/support/OSThread.java
===================================================================
--- trunk/freenet/src/freenet/support/OSThread.java 2007-08-28 00:59:57 UTC
(rev 14898)
+++ trunk/freenet/src/freenet/support/OSThread.java 2007-08-28 01:26:17 UTC
(rev 14899)
@@ -18,6 +18,8 @@
public static boolean getPIDEnabled = false;
public static boolean getPPIDEnabled = false;
+ public static boolean logToFileEnabled = false;
+ public static boolean logToStdOutEnabled = false;
public static boolean procSelfStatEnabled = false;
/**
@@ -84,9 +86,6 @@
sb.append( (char) b );
}
try {
- msg = "DEBUG: Gonna parse
["+sb.toString()+"]";
- System.out.println(msg + ": " + o);
- Logger.normal(o, msg);
String[] procStrings =
sb.toString().trim().split(" ");
if(4 <= procStrings.length) {
String pidString = procStrings[
0 ];
@@ -148,9 +147,6 @@
sb.append( (char) b );
}
try {
- msg = "DEBUG: Gonna parse
["+sb.toString()+"]";
- System.out.println(msg + ": " + o);
- Logger.normal(o, msg);
String[] procStrings =
sb.toString().trim().split(" ");
if(4 <= procStrings.length) {
String ppidString =
procStrings[ 3 ];
@@ -182,8 +178,12 @@
} else {
msg = "This thread's OS PID could not be determined";
}
- System.out.println(msg + ": " + o);
- Logger.normal(o, msg);
+ if(logToStdOutEnabled) {
+ System.out.println(msg + ": " + o);
+ }
+ if(logToFileEnabled) {
+ Logger.normal(o, msg);
+ }
return pid;
}
@@ -201,8 +201,12 @@
} else {
msg = "This thread's OS PPID could not be determined";
}
- System.out.println(msg + ": "+o);
- Logger.normal(o, msg);
+ if(logToStdOutEnabled) {
+ System.out.println(msg + ": " + o);
+ }
+ if(logToFileEnabled) {
+ Logger.normal(o, msg);
+ }
return ppid;
}
}
Modified: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
2007-08-28 00:59:57 UTC (rev 14898)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
2007-08-28 01:26:17 UTC (rev 14899)
@@ -211,6 +211,7 @@
}
public void run() {
+ freenet.support.OSThread.logPID(this);
while(true) {
try {
Thread.sleep(interval);
