Author: toad
Date: 2008-04-15 18:03:59 +0000 (Tue, 15 Apr 2008)
New Revision: 19354
Modified:
trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
trunk/freenet/src/freenet/node/DNSRequester.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/RequestStarter.java
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/TestnetStatusUploader.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Move some more threads onto the executor.
Modified: trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
2008-04-15 17:53:31 UTC (rev 19353)
+++ trunk/freenet/src/freenet/client/async/BackgroundBlockEncoder.java
2008-04-15 18:03:59 UTC (rev 19354)
@@ -3,13 +3,15 @@
import java.lang.ref.SoftReference;
import java.util.ArrayList;
+import freenet.node.PrioRunnable;
import freenet.support.Logger;
+import freenet.support.io.NativeThread;
/**
* Keeps a queue of SingleBlockInserter's to encode.
* Encodes them.
*/
-public class BackgroundBlockEncoder implements Runnable {
+public class BackgroundBlockEncoder implements PrioRunnable {
// Minimize memory usage at the cost of having to encode from the end
private final ArrayList queue;
@@ -69,4 +71,8 @@
}
}
+ public int getPriority() {
+ return NativeThread.MIN_PRIORITY;
+ }
+
}
Modified: trunk/freenet/src/freenet/node/DNSRequester.java
===================================================================
--- trunk/freenet/src/freenet/node/DNSRequester.java 2008-04-15 17:53:31 UTC
(rev 19353)
+++ trunk/freenet/src/freenet/node/DNSRequester.java 2008-04-15 18:03:59 UTC
(rev 19354)
@@ -13,7 +13,6 @@
*/
public class DNSRequester implements Runnable {
- final Thread myThread;
final Node node;
private long lastLogTime;
// Only set when doing simulations.
@@ -21,14 +20,12 @@
DNSRequester(Node node) {
this.node = node;
- myThread = new Thread(this, "DNSRequester thread for
"+node.getDarknetPortNumber());
- myThread.setDaemon(true);
}
void start() {
Logger.normal(this, "Starting DNSRequester");
System.out.println("Starting DNSRequester");
- myThread.start();
+ node.executor.execute(this, "DNSRequester thread for
"+node.getDarknetPortNumber());
}
public void run() {
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2008-04-15 17:53:31 UTC
(rev 19353)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2008-04-15 18:03:59 UTC
(rev 19354)
@@ -116,7 +116,6 @@
static final int MAX_CACHED_ELEMENTS = 256*1024; // equally arbitrary!
FIXME hopefully we can cache many of these though
private UserAlert startingUpAlert;
- private final NativeThread backgroundBlockEncoderThread;
NodeClientCore(Node node, Config config, SubConfig nodeConfig, File
nodeDir, int portNumber, int sortOrder, SimpleFieldSet oldThrottleFS,
SimpleFieldSet oldConfig, SubConfig fproxyConfig, SimpleToadletServer toadlets)
throws NodeInitException {
this.node = node;
@@ -131,8 +130,6 @@
else prio = NativeThread.MIN_PRIORITY;
clientSlowSerialExecutor[i] = new SerialExecutor(prio);
}
- backgroundBlockEncoderThread = new
NativeThread(backgroundBlockEncoder, "Background block encoder",
NativeThread.MIN_PRIORITY, false);
- backgroundBlockEncoderThread.setDaemon(true);
byte[] pwdBuf = new byte[16];
random.nextBytes(pwdBuf);
this.formPassword = Base64.encode(pwdBuf);
@@ -396,7 +393,7 @@
}
public void start(Config config) throws NodeInitException {
- backgroundBlockEncoderThread.start();
+ node.executor.execute(backgroundBlockEncoder, "Background block
encoder");
persister.start();
if(fcpServer != null)
fcpServer.maybeStart();
Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java 2008-04-15 17:53:31 UTC
(rev 19353)
+++ trunk/freenet/src/freenet/node/RequestStarter.java 2008-04-15 18:03:59 UTC
(rev 19354)
@@ -81,9 +81,7 @@
}
void start() {
- Thread t = new Thread(this, name);
- t.setDaemon(true);
- t.start();
+ core.getExecutor().execute(this, name);
}
final String name;
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2008-04-15 17:53:31 UTC
(rev 19353)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2008-04-15 18:03:59 UTC
(rev 19354)
@@ -62,15 +62,12 @@
}
public void start() {
- serverThread = new Thread(this, "Testnet handler thread");
- serverThread.setDaemon(true);
- serverThread.start();
+ node.executor.execute(this, "Testnet handler thread");
uploader.start();
System.err.println("Started testnet handler on port
"+testnetPort);
}
private final Node node;
- private Thread serverThread;
private ServerSocket server;
private int testnetPort;
Modified: trunk/freenet/src/freenet/node/TestnetStatusUploader.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetStatusUploader.java 2008-04-15
17:53:31 UTC (rev 19353)
+++ trunk/freenet/src/freenet/node/TestnetStatusUploader.java 2008-04-15
18:03:59 UTC (rev 19354)
@@ -34,13 +34,10 @@
}
void start() {
- uploaderThread = new Thread(this, "TestnetStatusUploader
thread");
- uploaderThread.setDaemon(true);
- uploaderThread.start();
+ node.executor.execute(this, "TestnetStatusUploader thread");
}
private final Node node;
- private Thread uploaderThread;
private final int updateInterval;
private Socket client;
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2008-04-15 17:53:31 UTC (rev 19353)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2008-04-15 18:03:59 UTC (rev 19354)
@@ -93,9 +93,7 @@
HighLevelSimpleClient client =
core.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, true);
TextModeClientInterface directTMCI =
new TextModeClientInterface(node, client,
core.downloadDir, System.in, System.out);
- Thread t = new Thread(directTMCI, "Direct text mode
interface");
- t.setDaemon(true);
- t.start();
+ node.executor.execute(directTMCI, "Direct text mode
interface");
core.setDirectTMCI(directTMCI);
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2008-04-15 17:53:31 UTC
(rev 19353)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2008-04-15 18:03:59 UTC
(rev 19354)
@@ -88,9 +88,7 @@
private boolean hasFinishedStart;
private void startPersister() {
- Thread t = new Thread(persister = new FCPServerPersister(),
"FCP request persister");
- t.setDaemon(true);
- t.start();
+ node.executor.execute(persister = new FCPServerPersister(),
"FCP request persister");
}
private void killPersister() {
