Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '524-check-that-acra-is-catching-all-uncaught-exceptions' into 'master'

Browse Source 
Introduce a @Scheduler annotation

and make sure work is offloaded to an executor, so exceptions can be caught.

Closes #524

See merge request !422
This commit is contained in:
akwizgran
2016-11-18 16:00:22 +00:00
parent dbbeb37485 20708bc156
commit e4676517ef
7 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-core/src/org/briarproject/plugins/PluginsModule.java
View File

@@ -8,6 +8,7 @@ import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.ConnectionRegistry;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.Scheduler;
import java.security.SecureRandom;
import java.util.concurrent.Executor;
@@ -37,7 +38,7 @@ public class PluginsModule {
@Provides
@Singleton
Poller providePoller(@IoExecutor Executor ioExecutor,
ScheduledExecutorService scheduler,
@Scheduler ScheduledExecutorService scheduler,
ConnectionManager connectionManager,
ConnectionRegistry connectionRegistry, PluginManager pluginManager,
SecureRandom random, Clock clock, EventBus eventBus) {

31
briar-core/src/org/briarproject/plugins/Poller.java
View File

@@ -18,6 +18,7 @@ import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.plugins.simplex.SimplexPlugin;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.Scheduler;
import java.security.SecureRandom;
import java.util.HashMap;
@@ -48,7 +49,8 @@ class Poller implements EventListener {
private final Map<TransportId, PollTask> tasks; // Locking: lock
@Inject
Poller(@IoExecutor Executor ioExecutor, ScheduledExecutorService scheduler,
Poller(@IoExecutor Executor ioExecutor,
@Scheduler ScheduledExecutorService scheduler,
ConnectionManager connectionManager,
ConnectionRegistry connectionRegistry, PluginManager pluginManager,
SecureRandom random, Clock clock) {
@@ -135,13 +137,14 @@ class Poller implements EventListener {
private void reschedule(TransportId t) {
Plugin p = pluginManager.getPlugin(t);
if (p.shouldPoll()) schedule(p, p.getPollingInterval(), false);
if (p != null && p.shouldPoll())
schedule(p, p.getPollingInterval(), false);
}
private void pollNow(TransportId t) {
Plugin p = pluginManager.getPlugin(t);
// Randomise next polling interval
if (p.shouldPoll()) schedule(p, 0, true);
if (p != null && p.shouldPoll()) schedule(p, 0, true);
}
private void schedule(Plugin p, int delay, boolean randomiseNext) {
@@ -152,24 +155,25 @@ class Poller implements EventListener {
try {
PollTask scheduled = tasks.get(t);
if (scheduled == null || due < scheduled.due) {
PollTask task = new PollTask(p, due, randomiseNext);
final PollTask task = new PollTask(p, due, randomiseNext);
tasks.put(t, task);
scheduler.schedule(task, delay, MILLISECONDS);
scheduler.schedule(new Runnable() {
@Override
public void run() {
ioExecutor.execute(task);
}
}, delay, MILLISECONDS);
}
} finally {
lock.unlock();
}
}
@IoExecutor
private void poll(final Plugin p) {
ioExecutor.execute(new Runnable() {
@Override
public void run() {
TransportId t = p.getId();
if (LOG.isLoggable(INFO)) LOG.info("Polling plugin " + t);
p.poll(connectionRegistry.getConnectedContacts(t));
}
});
TransportId t = p.getId();
if (LOG.isLoggable(INFO)) LOG.info("Polling plugin " + t);
p.poll(connectionRegistry.getConnectedContacts(t));
}
private class PollTask implements Runnable {
@@ -185,6 +189,7 @@ class Poller implements EventListener {
}
@Override
@IoExecutor
public void run() {
lock.lock();
try {