[freenet-cvs] r17928 - in trunk/freenet/src/freenet: io/comm node

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-02-15 08:18:15 +0000 (Fri, 15 Feb 2008)
New Revision: 17928

Modified:
   trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
   trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
Log:
Implement NativeThread in some other places : it will probably break if we aren't instanciating the classes from a high-priority thread.

The executor can do it for us if needed.

Modified: trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java	2008-02-15 08:13:37 UTC (rev 17927)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketHandler.java	2008-02-15 08:18:15 UTC (rev 17928)
@@ -19,8 +19,9 @@
 import freenet.support.FileLoggerHook;
 import freenet.support.Logger;
 import freenet.support.OOMHandler;
+import freenet.support.io.NativeThread;
 
-public class UdpSocketHandler extends Thread implements PacketSocketHandler, PortForwardSensitiveSocketHandler {
+public class UdpSocketHandler extends NativeThread implements PacketSocketHandler, PortForwardSensitiveSocketHandler {
 
 	private final DatagramSocket _sock;
 	private final InetAddress _bindTo;
@@ -44,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);
+		super("UDP packet receiver for "+title, Thread.MAX_PRIORITY);
 		this.node = node;
 		this.title = title;
 		_bindTo = bindto;
@@ -293,16 +294,14 @@
 	public void start(boolean disableHangChecker) {
 		lastTimeInSeconds = (int) (System.currentTimeMillis() / 1000);
 		setDaemon(true);
-		setPriority(Thread.MAX_PRIORITY);
 		synchronized(this) {
 			if(!_active) return;
 			_started = true;
 		}
 		super.start();
 		if(!disableHangChecker) {
-			Thread checker = new Thread(new USMChecker(), "MessageCore$USMChecker");
+			NativeThread checker = new NativeThread(new USMChecker(), "MessageCore$USMChecker", Thread.MAX_PRIORITY);
 			checker.setDaemon(true);
-			checker.setPriority(Thread.MAX_PRIORITY);
 			checker.start();
 		}
 	}

Modified: trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java
===================================================================
--- trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java	2008-02-15 08:13:37 UTC (rev 17927)
+++ trunk/freenet/src/freenet/node/CPUAdjustingSwapRequestInterval.java	2008-02-15 08:18:15 UTC (rev 17928)
@@ -4,6 +4,7 @@
 package freenet.node;
 
 import freenet.support.Logger;
+import freenet.support.io.NativeThread;
 
 /**
  * @author amphibian
@@ -27,9 +28,8 @@
     }
 
     public void start() {
-        Thread t = new Thread(this, "CPUAdjustingSwapRequestInterval");
+        NativeThread t = new NativeThread(this, "CPUAdjustingSwapRequestInterval", Thread.MAX_PRIORITY);
         t.setDaemon(true);
-        t.setPriority(Thread.MAX_PRIORITY);
         t.start();
     }