Minik bugfix.

eknkc · Feb 15, 2011 · ab13db9 · ab13db9
1 parent ed81e5a
commit ab13db9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/a-cma/src/edu/atilim/acma/Server.java b/a-cma/src/edu/atilim/acma/Server.java
@@ -15,6 +15,7 @@ public class Server implements Runnable, ConnectionListener {
 
 	private InstanceSet instances;
 	private ConcurrentTask currentTask = null;
+	private Listener listener = null;
 	private volatile boolean running = false;
 
 	public Server(int port) {
@@ -30,12 +31,13 @@ public void run() {
 			try {
 				Server server = new Server(port);
 				if (!first)
-					server.autostart = 60;
+					server.autostart = 30;
 				first = false;
 
 				server.runInternal();
+				server.dispose();
 
-				try { Thread.sleep(2000); } catch (InterruptedException e) { }
+				try { Thread.sleep(5000); } catch (InterruptedException e) { }
 			} catch (TaskInterruptedException e) {
 			}
 		}
@@ -44,7 +46,7 @@ public void run() {
 	private void runInternal() {
 		System.out.printf("[Server] Listening port %d for incoming connections.\n", port);
 
-		Listener listener = SocketInstance.tryListen(port, this);
+		listener = SocketInstance.tryListen(port, this);
 
 		if (listener == null) {
 			System.out.printf("[Server] Can not listen port %d\n", port);
@@ -98,6 +100,8 @@ private void runInternal() {
 				run(new TerminateTask());
 			}
 
+			currentTask.clearInterrupt();
+
 			System.out.printf("[Server] Running algorithm task %s, Remaining: %d.\n", currentTask, TaskQueue.size() - 1);
 
 			run(currentTask);
@@ -139,6 +143,7 @@ public synchronized void dispose() {
 			System.out.println("[Server] Disposing server.");
 			try { instances.dispose(); } catch (Exception e) { }
 			try { currentTask.interrupt(); } catch (Exception e) { }
+			try { listener.stop(); } catch (Exception e) { }
 		}
 	}
 }
diff --git a/a-cma/src/edu/atilim/acma/concurrent/ConcurrentTask.java b/a-cma/src/edu/atilim/acma/concurrent/ConcurrentTask.java
@@ -6,4 +6,5 @@ public interface ConcurrentTask extends Serializable {
 	public void runMaster(InstanceSet instances);
 	public void runWorker(Instance master);
 	public void interrupt();
+	public void clearInterrupt();
 }
diff --git a/a-cma/src/edu/atilim/acma/concurrent/SocketInstance.java b/a-cma/src/edu/atilim/acma/concurrent/SocketInstance.java
@@ -184,6 +184,8 @@ public synchronized void dispose() {
 
 			if (connectionListener != null)
 				connectionListener.onDisconnect(this);
+
+			connectionListener = null;
 		}
 	}
 

diff --git a/a-cma/src/edu/atilim/acma/concurrent/TerminateTask.java b/a-cma/src/edu/atilim/acma/concurrent/TerminateTask.java
@@ -18,4 +18,8 @@ public void runWorker(Instance master) {
 	@Override
 	public void interrupt() {
 	}
+
+	@Override
+	public void clearInterrupt() {
+	}
 }
diff --git a/a-cma/src/edu/atilim/acma/search/ConcurrentAlgorithm.java b/a-cma/src/edu/atilim/acma/search/ConcurrentAlgorithm.java
@@ -34,6 +34,10 @@ protected boolean isInterrupted() {
 		return interrupted;
 	}
 
+	public void clearInterrupt() {
+		interrupted = false;
+	}
+
 	@Override
 	public void interrupt() {
 		interrupted = true;