Debugging Bluetooth threading issues.

api/net/sf/briar/api/plugins/BatchPluginFactory.java

@@ -1,9 +1,9 @@
 package net.sf.briar.api.plugins;
 
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 public interface BatchPluginFactory {
 
-	BatchPlugin createPlugin(ScheduledExecutorService pluginExecutor,
+	BatchPlugin createPlugin(Executor pluginExecutor,
 			BatchPluginCallback callback);
 }

api/net/sf/briar/api/plugins/StreamPluginFactory.java

@@ -1,9 +1,9 @@
 package net.sf.briar.api.plugins;
 
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 public interface StreamPluginFactory {
 
-	StreamPlugin createPlugin(ScheduledExecutorService pluginExecutor,
+	StreamPlugin createPlugin(Executor pluginExecutor,
 			StreamPluginCallback callback);
 }

components/net/sf/briar/plugins/PluginManagerImpl.java

@@ -7,7 +7,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -51,7 +51,7 @@ class PluginManagerImpl implements PluginManager {
 		"net.sf.briar.plugins.socket.SimpleSocketPluginFactory"
 	};
 
-	private final ScheduledExecutorService pluginExecutor;
+	private final ExecutorService pluginExecutor;
 	private final DatabaseComponent db;
 	private final Poller poller;
 	private final ConnectionDispatcher dispatcher;
@@ -60,7 +60,7 @@ class PluginManagerImpl implements PluginManager {
 	private final List<StreamPlugin> streamPlugins; // Locking: this
 
 	@Inject
-	PluginManagerImpl(@PluginExecutor ScheduledExecutorService pluginExecutor,
+	PluginManagerImpl(@PluginExecutor ExecutorService pluginExecutor,
 			DatabaseComponent db, Poller poller,
 			ConnectionDispatcher dispatcher, UiCallback uiCallback) {
 		this.pluginExecutor = pluginExecutor;

components/net/sf/briar/plugins/PluginsModule.java

@@ -1,7 +1,7 @@
 package net.sf.briar.plugins;
 
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 
 import net.sf.briar.api.plugins.PluginExecutor;
 import net.sf.briar.api.plugins.PluginManager;
@@ -13,9 +13,9 @@ public class PluginsModule extends AbstractModule {
 
 	@Override
 	protected void configure() {
-		bind(ScheduledExecutorService.class).annotatedWith(
+		bind(ExecutorService.class).annotatedWith(
 				PluginExecutor.class).toInstance(
-						Executors.newScheduledThreadPool(1));
+						Executors.newCachedThreadPool());
 		bind(PluginManager.class).to(
 				PluginManagerImpl.class).in(Singleton.class);
 		bind(Poller.class).to(PollerImpl.class);

components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java

@@ -4,10 +4,11 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -41,23 +42,25 @@ class BluetoothPlugin implements StreamPlugin {
 	private static final Logger LOG =
 		Logger.getLogger(BluetoothPlugin.class.getName());
 
-	private final ScheduledExecutorService pluginExecutor;
+	private final Executor pluginExecutor;
 	private final StreamPluginCallback callback;
 	private final long pollingInterval;
 	private final Object discoveryLock = new Object();
+	private final ScheduledExecutorService scheduler;
 	// Locking: this
-	private final Collection<StreamConnectionNotifier> invitationSockets;
+	private final Map<StreamConnectionNotifier, ScheduledFuture<?>> sockets;
 
 	private boolean running = false; // Locking: this
 	private LocalDevice localDevice = null; // Locking: this
 	private StreamConnectionNotifier socket = null; // Locking: this
 
-	BluetoothPlugin(@PluginExecutor ScheduledExecutorService pluginExecutor,
+	BluetoothPlugin(@PluginExecutor Executor pluginExecutor,
 			StreamPluginCallback callback, long pollingInterval) {
 		this.pluginExecutor = pluginExecutor;
 		this.callback = callback;
 		this.pollingInterval = pollingInterval;
-		invitationSockets = new HashSet<StreamConnectionNotifier>();
+		scheduler = Executors.newScheduledThreadPool(0);
+		sockets = new HashMap<StreamConnectionNotifier, ScheduledFuture<?>>();
 	}
 
 	public TransportId getId() {
@@ -173,8 +176,11 @@ class BluetoothPlugin implements StreamPlugin {
 	public synchronized void stop() {
 		running = false;
 		localDevice = null;
-		for(StreamConnectionNotifier scn : invitationSockets) tryToClose(scn);
+		for(Entry<StreamConnectionNotifier, ScheduledFuture<?>> e
-		invitationSockets.clear();
+				: sockets.entrySet()) {
+			if(e.getValue().cancel(false)) tryToClose(e.getKey());
+		}
+		sockets.clear();
 		if(socket != null) {
 			tryToClose(socket);
 			socket = null;
@@ -383,31 +389,31 @@ class BluetoothPlugin implements StreamPlugin {
 			if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.toString());
 			return;
 		}
-		synchronized(this) {
-			if(!running) {
-				tryToClose(scn);
-				return;
-			}
-			invitationSockets.add(scn);
-		}
 		// Close the socket when the invitation times out
 		Runnable close = new Runnable() {
 			public void run() {
 				synchronized(this) {
-					invitationSockets.remove(scn);
+					sockets.remove(scn);
 				}
 				tryToClose(scn);
 			}
 		};
-		ScheduledFuture<?> future = pluginExecutor.schedule(close,
+		ScheduledFuture<?> future = scheduler.schedule(close,
 				c.getTimeout(), TimeUnit.MILLISECONDS);
+		synchronized(this) {
+			if(!running) {
+				if(future.cancel(false)) tryToClose(scn);
+				return;
+			}
+			sockets.put(scn, future);
+		}
 		// Try to accept a connection
 		try {
 			StreamConnection s = scn.acceptAndOpen();
 			// Close the socket and return the connection
 			if(future.cancel(false)) {
 				synchronized(this) {
-					invitationSockets.remove(scn);
+					sockets.remove(scn);
 				}
 				tryToClose(scn);
 			}

components/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java

@@ -1,6 +1,6 @@
 package net.sf.briar.plugins.bluetooth;
 
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.plugins.PluginExecutor;
 import net.sf.briar.api.plugins.StreamPlugin;
@@ -11,8 +11,7 @@ public class BluetoothPluginFactory implements StreamPluginFactory {
 
 	private static final long POLLING_INTERVAL = 3L * 60L * 1000L; // 3 mins
 
-	public StreamPlugin createPlugin(
+	public StreamPlugin createPlugin(@PluginExecutor Executor pluginExecutor,
-			@PluginExecutor ScheduledExecutorService pluginExecutor,
 			StreamPluginCallback callback) {
 		return new BluetoothPlugin(pluginExecutor, callback, POLLING_INTERVAL);
 	}

components/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java

@@ -1,6 +1,6 @@
 package net.sf.briar.plugins.file;
 
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.plugins.BatchPlugin;
 import net.sf.briar.api.plugins.BatchPluginCallback;
@@ -12,8 +12,7 @@ public class RemovableDrivePluginFactory implements BatchPluginFactory {
 
 	private static final long POLLING_INTERVAL = 10L * 1000L; // 10 seconds
 
-	public BatchPlugin createPlugin(
+	public BatchPlugin createPlugin(@PluginExecutor Executor pluginExecutor,
-			@PluginExecutor ScheduledExecutorService pluginExecutor,
 			BatchPluginCallback callback) {
 		RemovableDriveFinder finder;
 		RemovableDriveMonitor monitor;

components/net/sf/briar/plugins/socket/LanSocketPlugin.java

@@ -10,7 +10,7 @@ import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.util.Random;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -25,7 +25,7 @@ class LanSocketPlugin extends SimpleSocketPlugin {
 	private static final Logger LOG =
 		Logger.getLogger(LanSocketPlugin.class.getName());
 
-	LanSocketPlugin(@PluginExecutor ScheduledExecutorService pluginExecutor,
+	LanSocketPlugin(@PluginExecutor Executor pluginExecutor,
 			StreamPluginCallback callback, long pollingInterval) {
 		super(pluginExecutor, callback, pollingInterval);
 	}

components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java

@@ -9,7 +9,7 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -31,7 +31,7 @@ class SimpleSocketPlugin extends SocketPlugin {
 	private static final Logger LOG =
 		Logger.getLogger(SimpleSocketPlugin.class.getName());
 
-	SimpleSocketPlugin(@PluginExecutor ScheduledExecutorService pluginExecutor,
+	SimpleSocketPlugin(@PluginExecutor Executor pluginExecutor,
 			StreamPluginCallback callback, long pollingInterval) {
 		super(pluginExecutor, callback, pollingInterval);
 	}

components/net/sf/briar/plugins/socket/SimpleSocketPluginFactory.java

@@ -1,6 +1,6 @@
 package net.sf.briar.plugins.socket;
 
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.plugins.PluginExecutor;
 import net.sf.briar.api.plugins.StreamPlugin;
@@ -11,8 +11,7 @@ public class SimpleSocketPluginFactory implements StreamPluginFactory {
 
 	private static final long POLLING_INTERVAL = 5L * 60L * 1000L; // 5 mins
 
-	public StreamPlugin createPlugin(
+	public StreamPlugin createPlugin(@PluginExecutor Executor pluginExecutor,
-			@PluginExecutor ScheduledExecutorService pluginExecutor,
 			StreamPluginCallback callback) {
 		return new SimpleSocketPlugin(pluginExecutor, callback,
 				POLLING_INTERVAL);

components/net/sf/briar/plugins/socket/SocketPlugin.java

@@ -6,7 +6,7 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -22,7 +22,7 @@ abstract class SocketPlugin implements StreamPlugin {
 	private static final Logger LOG =
 		Logger.getLogger(SocketPlugin.class.getName());
 
-	protected final ScheduledExecutorService pluginExecutor;
+	protected final Executor pluginExecutor;
 	protected final StreamPluginCallback callback;
 
 	private final long pollingInterval;
@@ -37,8 +37,7 @@ abstract class SocketPlugin implements StreamPlugin {
 	protected abstract SocketAddress getLocalSocketAddress();
 	protected abstract SocketAddress getRemoteSocketAddress(ContactId c);
 
-	protected SocketPlugin(
+	protected SocketPlugin(@PluginExecutor Executor pluginExecutor,
-			@PluginExecutor ScheduledExecutorService pluginExecutor,
 			StreamPluginCallback callback, long pollingInterval) {
 		this.pluginExecutor = pluginExecutor;
 		this.callback = callback;

test/net/sf/briar/plugins/PluginManagerImplTest.java

@@ -1,8 +1,8 @@
 package net.sf.briar.plugins;
 
 import java.util.Collection;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import net.sf.briar.BriarTestCase;
@@ -43,7 +43,7 @@ public class PluginManagerImplTest extends BriarTestCase {
 					with(any(TransportProperties.class)));
 			oneOf(poller).stop();
 		}});
-		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+		ExecutorService executor = Executors.newCachedThreadPool();
 		PluginManagerImpl p = new PluginManagerImpl(executor, db, poller,
 				dispatcher, uiCallback);
 		// We expect either 2 or 3 plugins to be started, depending on whether

test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java

@@ -3,7 +3,7 @@ package net.sf.briar.plugins.bluetooth;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportConfig;
@@ -24,7 +24,7 @@ public class BluetoothClientTest extends StreamClientTest {
 		// Create the plugin
 		callback = new ClientCallback(new TransportConfig(),
 				new TransportProperties(), remote);
-		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+		Executor executor = Executors.newCachedThreadPool();
 		plugin = new BluetoothPlugin(executor, callback, 0L);
 	}
 

test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java

@@ -2,7 +2,7 @@ package net.sf.briar.plugins.bluetooth;
 
 import java.util.Collections;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.TransportConfig;
 import net.sf.briar.api.TransportProperties;
@@ -19,7 +19,7 @@ public class BluetoothServerTest extends StreamServerTest {
 		// Create the plugin
 		callback = new ServerCallback(new TransportConfig(), local,
 				Collections.singletonMap(contactId, new TransportProperties()));
-		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+		Executor executor = Executors.newCachedThreadPool();
 		plugin = new BluetoothPlugin(executor, callback, 0L);
 	}
 

test/net/sf/briar/plugins/socket/LanSocketClientTest.java

@@ -3,7 +3,7 @@ package net.sf.briar.plugins.socket;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.ContactId;
 import net.sf.briar.api.TransportConfig;
@@ -24,7 +24,7 @@ public class LanSocketClientTest extends StreamClientTest {
 		// Create the plugin
 		callback = new ClientCallback(new TransportConfig(),
 				new TransportProperties(), remote);
-		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+		Executor executor = Executors.newCachedThreadPool();
 		plugin = new LanSocketPlugin(executor, callback, 0L);
 	}
 

test/net/sf/briar/plugins/socket/LanSocketServerTest.java

@@ -2,7 +2,7 @@ package net.sf.briar.plugins.socket;
 
 import java.util.Collections;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 
 import net.sf.briar.api.TransportConfig;
 import net.sf.briar.api.TransportProperties;
@@ -16,7 +16,7 @@ public class LanSocketServerTest extends StreamServerTest {
 		callback = new ServerCallback(new TransportConfig(),
 				new TransportProperties(),
 				Collections.singletonMap(contactId, new TransportProperties()));
-		ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+		Executor executor = Executors.newCachedThreadPool();
 		plugin = new LanSocketPlugin(executor, callback, 0L);
 	}
 

test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java

@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -30,7 +30,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
 		StreamCallback callback = new StreamCallback();
 		callback.local.put("internal", "127.0.0.1");
 		callback.local.put("port", "0");
-		ScheduledExecutorService e = Executors.newScheduledThreadPool(1);
+		Executor e = Executors.newCachedThreadPool();
 		SimpleSocketPlugin plugin = new SimpleSocketPlugin(e, callback, 0L);
 		plugin.start();
 		// The plugin should have bound a socket and stored the port number
@@ -64,7 +64,7 @@ public class SimpleSocketPluginTest extends BriarTestCase {
 	@Test
 	public void testOutgoingConnection() throws Exception {
 		StreamCallback callback = new StreamCallback();
-		ScheduledExecutorService e = Executors.newScheduledThreadPool(1);
+		Executor e = Executors.newCachedThreadPool();
 		SimpleSocketPlugin plugin = new SimpleSocketPlugin(e, callback, 0L);
 		plugin.start();
 		// Listen on a local port