Author: toad
Date: 2008-02-16 18:24:23 +0000 (Sat, 16 Feb 2008)
New Revision: 18004
Modified:
trunk/freenet/src/freenet/client/FECCodec.java
trunk/freenet/src/freenet/crypt/DiffieHellman.java
trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/NodeStarter.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/support/PooledExecutor.java
Log:
Use the NativeThread priority range.
Modified: trunk/freenet/src/freenet/client/FECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/FECCodec.java 2008-02-16 18:20:42 UTC
(rev 18003)
+++ trunk/freenet/src/freenet/client/FECCodec.java 2008-02-16 18:24:23 UTC
(rev 18004)
@@ -324,7 +324,7 @@
public static void addToQueue(FECJob job, FECCodec codec) {
synchronized(_awaitingJobs) {
if(fecRunnerThread == null) {
- fecRunnerThread = new NativeThread(fecRunner,
"FEC Pool " + (fecPoolCounter++), Thread.MIN_PRIORITY+2, true);
+ fecRunnerThread = new NativeThread(fecRunner,
"FEC Pool " + (fecPoolCounter++), NativeThread.LOW_PRIORITY, true);
fecRunnerThread.setDaemon(true);
fecRunnerThread.start();
Modified: trunk/freenet/src/freenet/crypt/DiffieHellman.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellman.java 2008-02-16 18:20:42 UTC
(rev 18003)
+++ trunk/freenet/src/freenet/crypt/DiffieHellman.java 2008-02-16 18:24:23 UTC
(rev 18004)
@@ -49,7 +49,7 @@
private static class PrecalcBufferFill extends NativeThread {
public PrecalcBufferFill() {
- super("Diffie-Hellman-Precalc", Thread.MIN_PRIORITY+2,
false);
+ super("Diffie-Hellman-Precalc",
NativeThread.LOW_PRIORITY, false);
setDaemon(true);
}
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2008-02-16
18:20:42 UTC (rev 18003)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java 2008-02-16
18:24:23 UTC (rev 18004)
@@ -45,7 +45,7 @@
private boolean _started;
public UdpSocketHandler(int listenPort, InetAddress bindto, Node node,
long startupTime, String title) throws SocketException {
- super("UDP packet receiver for "+title, Thread.MAX_PRIORITY,
false);
+ super("UDP packet receiver for "+title,
NativeThread.MAX_PRIORITY, false);
this.node = node;
this.title = title;
_bindTo = bindto;
@@ -301,7 +301,7 @@
}
super.start();
if(!disableHangChecker) {
- node.executor.execute(new USMChecker(),
"UdpSockerHandler watchdog", Thread.MAX_PRIORITY, false);
+ node.executor.execute(new USMChecker(),
"UdpSockerHandler watchdog", NativeThread.MAX_PRIORITY, false);
}
}
Modified: trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
===================================================================
--- trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
2008-02-16 18:20:42 UTC (rev 18003)
+++ trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
2008-02-16 18:24:23 UTC (rev 18004)
@@ -28,7 +28,7 @@
}
public void start() {
- NativeThread t = new NativeThread(this,
"CPUAdjustingSwapRequestInterval", Thread.MAX_PRIORITY, false);
+ NativeThread t = new NativeThread(this,
"CPUAdjustingSwapRequestInterval", NativeThread.MAX_PRIORITY, false);
t.setDaemon(true);
t.start();
}
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-02-16
18:20:42 UTC (rev 18003)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-02-16
18:24:23 UTC (rev 18004)
@@ -46,6 +46,8 @@
import freenet.support.StringArray;
import freenet.support.TimeUtil;
import freenet.support.WouldBlockException;
+import freenet.support.io.NativeThread;
+
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.util.HashMap;
@@ -2581,7 +2583,7 @@
public void run() {
_fillJFKDHFIFO();
}
- }, "DiffieHellman exponential signing", Thread.NORM_PRIORITY);
+ }, "DiffieHellman exponential signing",
NativeThread.NORM_PRIORITY);
}
private void _fillJFKDHFIFO() {
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2008-02-16 18:20:42 UTC
(rev 18003)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2008-02-16 18:24:23 UTC
(rev 18004)
@@ -123,7 +123,7 @@
this.nodeStats = node.nodeStats;
this.random = node.random;
this.backgroundBlockEncoder = new BackgroundBlockEncoder();
- backgroundBlockEncoderThread = new
NativeThread(backgroundBlockEncoder, "Background block encoder",
Thread.MIN_PRIORITY, false);
+ backgroundBlockEncoderThread = new
NativeThread(backgroundBlockEncoder, "Background block encoder",
NativeThread.MIN_PRIORITY, false);
backgroundBlockEncoderThread.setDaemon(true);
byte[] pwdBuf = new byte[16];
random.nextBytes(pwdBuf);
Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java 2008-02-16 18:20:42 UTC
(rev 18003)
+++ trunk/freenet/src/freenet/node/NodeStarter.java 2008-02-16 18:24:23 UTC
(rev 18004)
@@ -141,7 +141,7 @@
}
}
};
- NativeThread plug = new NativeThread(useless, "Plug",
Thread.MAX_PRIORITY, false);
+ NativeThread plug = new NativeThread(useless, "Plug",
NativeThread.MAX_PRIORITY, false);
// Not daemon, but doesn't do anything.
// Keeps the JVM alive.
// DO NOT do anything in the plug thread, if you do you risk
the EvilJVMBug.
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-02-16 18:20:42 UTC
(rev 18003)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-02-16 18:24:23 UTC
(rev 18004)
@@ -62,7 +62,7 @@
resendPackets = new LinkedList();
timedJobsByTime = new TreeMap();
this.node = node;
- myThread = new NativeThread(this, "PacketSender thread for " +
node.getDarknetPortNumber(), Thread.MAX_PRIORITY, false);
+ myThread = new NativeThread(this, "PacketSender thread for " +
node.getDarknetPortNumber(), NativeThread.MAX_PRIORITY, false);
myThread.setDaemon(true);
logMINOR = Logger.shouldLog(Logger.MINOR, this);
logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
@@ -418,7 +418,7 @@
}
else
try {
- node.executor.execute(r,
"Scheduled job: " + r, Thread.NORM_PRIORITY, true);
+ node.executor.execute(r,
"Scheduled job: " + r, NativeThread.NORM_PRIORITY, true);
} catch(OutOfMemoryError e) {
OOMHandler.handleOOM(e);
System.err.println("Will retry
above failed operation...");
Modified: trunk/freenet/src/freenet/support/PooledExecutor.java
===================================================================
--- trunk/freenet/src/freenet/support/PooledExecutor.java 2008-02-16
18:20:42 UTC (rev 18003)
+++ trunk/freenet/src/freenet/support/PooledExecutor.java 2008-02-16
18:24:23 UTC (rev 18004)
@@ -43,7 +43,7 @@
}
public void execute(Runnable job, String jobName) {
- execute(job, jobName, Thread.NORM_PRIORITY);
+ execute(job, jobName, NativeThread.NORM_PRIORITY);
}
public void execute(Runnable job, String jobName, int prio) {
@@ -52,7 +52,7 @@
public void execute(Runnable job, String jobName, int prio, boolean
fromTicker) {
if(logMINOR) Logger.minor(this, "Executing "+job+" as
"+jobName+" at prio "+prio);
- if(prio < Thread.MIN_PRIORITY || prio > Thread.MAX_PRIORITY)
+ if(prio < NativeThread.MIN_PRIORITY || prio >
NativeThread.MAX_PRIORITY)
throw new IllegalArgumentException("Unreconized
priority level : "+prio+'!');
while(true) {
MyThread t;
