Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Debugging Bluetooth threading issues.

Browse Source
This commit is contained in:
akwizgran
2011-12-09 22:20:32 +00:00
parent 4671b50b37
commit 5ba5887565
17 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/net/sf/briar/plugins/PluginManagerImpl.java
View File

@@ -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;

6
components/net/sf/briar/plugins/PluginsModule.java
View File

@@ -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);

40
components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -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);
invitationSockets.clear();
for(Entry<StreamConnectionNotifier, ScheduledFuture<?>> e
: 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);
}

5
components/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
View File

@@ -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(
@PluginExecutor ScheduledExecutorService pluginExecutor,
public StreamPlugin createPlugin(@PluginExecutor Executor pluginExecutor,
StreamPluginCallback callback) {
return new BluetoothPlugin(pluginExecutor, callback, POLLING_INTERVAL);
}

5
components/net/sf/briar/plugins/file/RemovableDrivePluginFactory.java
View File

@@ -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(
@PluginExecutor ScheduledExecutorService pluginExecutor,
public BatchPlugin createPlugin(@PluginExecutor Executor pluginExecutor,
BatchPluginCallback callback) {
RemovableDriveFinder finder;
RemovableDriveMonitor monitor;

4
components/net/sf/briar/plugins/socket/LanSocketPlugin.java
View File

@@ -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);
}

4
components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java
View File

@@ -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);
}

5
components/net/sf/briar/plugins/socket/SimpleSocketPluginFactory.java
View File

@@ -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(
@PluginExecutor ScheduledExecutorService pluginExecutor,
public StreamPlugin createPlugin(@PluginExecutor Executor pluginExecutor,
StreamPluginCallback callback) {
return new SimpleSocketPlugin(pluginExecutor, callback,
POLLING_INTERVAL);

7
components/net/sf/briar/plugins/socket/SocketPlugin.java
View File

@@ -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(
@PluginExecutor ScheduledExecutorService pluginExecutor,
protected SocketPlugin(@PluginExecutor Executor pluginExecutor,
StreamPluginCallback callback, long pollingInterval) {
this.pluginExecutor = pluginExecutor;
this.callback = callback;