Author: zothar
Date: 2006-06-07 23:32:19 +0000 (Wed, 07 Jun 2006)
New Revision: 9077
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
trunk/freenet/src/freenet/node/DNSRequester.java
trunk/freenet/src/freenet/node/InsertHandler.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/RequestStarter.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Name some threads. Tweak the DNSRequester and PacketSender startup logging.
Fix a couple of logging related typos in BerkeleyDBFreenetStore.
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-06-07 23:25:17 UTC (rev 9076)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-06-07 23:32:19 UTC (rev 9077)
@@ -253,7 +253,7 @@
public SocketHandler(Socket conn) {
this.sock = conn;
- Thread t = new Thread(this);
+ Thread t = new Thread(this,
"SimpleToadletServer$SocketHandler");
t.setDaemon(true);
t.start();
}
Modified: trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-06-07
23:25:17 UTC (rev 9076)
+++ trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-06-07
23:32:19 UTC (rev 9077)
@@ -166,7 +166,7 @@
this.key = key;
this.inbytes = inbytes;
this.outbytes = outbytes;
- new Thread(this).run();
+ new Thread(this,
"IOStatisticCollector$StatisticUpdater").run();
}
public void run() {
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2006-06-07
23:25:17 UTC (rev 9076)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2006-06-07
23:32:19 UTC (rev 9077)
@@ -52,7 +52,7 @@
setDaemon(true);
setPriority(Thread.MAX_PRIORITY);
super.start();
- Thread checker = new Thread(new USMChecker());
+ Thread checker = new Thread(new USMChecker(),
"UdpSocketManager$USMChecker");
checker.setDaemon(true);
checker.setPriority(Thread.MAX_PRIORITY);
checker.start();
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-06-07
23:25:17 UTC (rev 9076)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-06-07
23:32:19 UTC (rev 9077)
@@ -483,7 +483,7 @@
public void sendAsync() {
Runnable r = new Runnable() {
public void run() { send(); } };
- Thread t = new Thread(r);
+ Thread t = new Thread(r, "BlockTransmitter:sendAsync()");
t.setDaemon(true);
t.start();
}
Modified: trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
===================================================================
--- trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
2006-06-07 23:25:17 UTC (rev 9076)
+++ trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
2006-06-07 23:32:19 UTC (rev 9077)
@@ -21,7 +21,7 @@
currentValue = initialValue;
this.targetCPUUsage = targetCPUUsage;
m = new CPUUsageMonitor();
- Thread t = new Thread(this);
+ Thread t = new Thread(this, "CPUAdjustingSwapRequestInterval");
t.setDaemon(true);
t.setPriority(Thread.MAX_PRIORITY);
t.start();
Modified: trunk/freenet/src/freenet/node/DNSRequester.java
===================================================================
--- trunk/freenet/src/freenet/node/DNSRequester.java 2006-06-07 23:25:17 UTC
(rev 9076)
+++ trunk/freenet/src/freenet/node/DNSRequester.java 2006-06-07 23:32:19 UTC
(rev 9077)
@@ -20,7 +20,8 @@
}
void start() {
- Logger.normal(this,"Starting the DNSRequester
thread");
+ Logger.normal(this, "Starting DNSRequester");
+ System.out.println("Starting DNSRequester");
myThread.start();
}
Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java 2006-06-07 23:25:17 UTC
(rev 9076)
+++ trunk/freenet/src/freenet/node/InsertHandler.java 2006-06-07 23:32:19 UTC
(rev 9077)
@@ -137,7 +137,7 @@
// Receive the data, off thread
Runnable dataReceiver = new DataReceiver();
- Thread t = new Thread(dataReceiver);
+ Thread t = new Thread(dataReceiver, "InsertHandler$DataReceiver for
UID "+uid);
t.setDaemon(true);
t.start();
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-06-07 23:25:17 UTC
(rev 9076)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-06-07 23:32:19 UTC
(rev 9077)
@@ -145,7 +145,7 @@
}
//if(!node.lockUID(id)) return false;
RequestHandler rh = new RequestHandler(m, id, node);
- Thread t = new Thread(rh);
+ Thread t = new Thread(rh, "RequestHandler for UID "+id);
t.setDaemon(true);
t.start();
return true;
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2006-06-07 23:25:17 UTC
(rev 9076)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2006-06-07 23:32:19 UTC
(rev 9077)
@@ -93,7 +93,8 @@
}
void start() {
- Logger.normal(this,"Starting the PacketSender thread");
+ Logger.normal(this, "Starting PacketSender");
+ System.out.println("Starting PacketSender");
// Necessary because of sun JVM bugs when NPTL is enabled. Write once,
debug everywhere!
Thread t1 = new Thread(new Watchdog(), "PacketSender watchdog");
t1.setDaemon(true);
Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java 2006-06-07 23:25:17 UTC
(rev 9076)
+++ trunk/freenet/src/freenet/node/RequestStarter.java 2006-06-07 23:32:19 UTC
(rev 9077)
@@ -72,7 +72,7 @@
// Create a thread to handle starting the
request, and the resulting feedback
while(true) {
try {
- Thread t = new Thread(new
SenderThread(req));
+ Thread t = new Thread(new
SenderThread(req), "RequestStarter$SenderThread for "+req);
t.setDaemon(true);
t.start();
Logger.minor(this, "Started
"+req+" on "+t);
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-06-07
23:25:17 UTC (rev 9076)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-06-07
23:32:19 UTC (rev 9077)
@@ -275,9 +275,10 @@
try {
chkStore.seek(seekTarget);
} catch (IOException ioe) {
- if(seekTarget > (2*1024*1024*1024))
+ if(seekTarget > (2*1024*1024*1024)) {
Logger.error(this, "Environment
does not support files bigger than 2 GB?");
System.out.println("Environment
does not support files bigger than 2 GB? (exception to follow)");
+ }
Logger.error(this, "Caught IOException
on chkStore.seek("+seekTarget+")");
throw ioe;
}
@@ -620,9 +621,10 @@
try {
chkStore.seek(byteOffset);
} catch (IOException ioe) {
- if(byteOffset > (2*1024*1024*1024))
+ if(byteOffset > (2*1024*1024*1024)) {
Logger.error(this, "Environment does not support
files bigger than 2 GB?");
System.out.println("Environment does not support
files bigger than 2 GB? (exception to follow)");
+ }
Logger.error(this, "Caught IOException on
chkStore.seek("+byteOffset+")");
throw ioe;
}
