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

Poll plugins when connectivity changes. Bug #66.

Browse Source 
This should enable us to connect to contacts faster at startup and
whenever a new means of connecting becomes available.
This commit is contained in:
akwizgran
2014-04-04 22:04:05 +01:00
parent 9f8d12e6c2
commit 08b91d2483
11 changed files with 113 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-core/src/org/briarproject/plugins/PluginManagerImpl.java
View File

@@ -363,6 +363,11 @@ class PluginManagerImpl implements PluginManager {
public void showMessage(String... message) {
uiCallback.showMessage(message);
}
public void pollNow() {
Plugin p = plugins.get(id);
if(p != null) poller.pollNow(p);
}
}
private class SimplexCallback extends PluginCallbackImpl

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

@@ -6,9 +6,12 @@ import org.briarproject.api.plugins.Plugin;
interface Poller {
/** Starts a new thread to poll the given collection of plugins. */
/** Starts a poller for the given collection of plugins. */
void start(Collection<Plugin> plugins);
/** Tells the poller thread to exit. */
/** Stops the poller. */
void stop();
/** Tells the poller to poll the given plugin immediately. */
void pollNow(Plugin p);
}

99
briar-core/src/org/briarproject/plugins/PollerImpl.java
View File

@@ -3,125 +3,72 @@ package org.briarproject.plugins;
import static java.util.logging.Level.INFO;
import java.util.Collection;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.TimerTask;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import org.briarproject.api.ContactId;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginExecutor;
import org.briarproject.api.system.Clock;
import org.briarproject.api.system.Timer;
import org.briarproject.api.transport.ConnectionRegistry;
class PollerImpl implements Poller, Runnable {
class PollerImpl implements Poller {
private static final Logger LOG =
Logger.getLogger(PollerImpl.class.getName());
private final Executor pluginExecutor;
private final ConnectionRegistry connRegistry;
private final Clock clock;
private final SortedSet<PollTime> pollTimes;
private final Timer timer;
@Inject
PollerImpl(@PluginExecutor Executor pluginExecutor,
ConnectionRegistry connRegistry, Clock clock) {
ConnectionRegistry connRegistry, Timer timer) {
this.pluginExecutor = pluginExecutor;
this.connRegistry = connRegistry;
this.clock = clock;
pollTimes = new TreeSet<PollTime>();
this.timer = timer;
}
public synchronized void start(Collection<Plugin> plugins) {
public void start(Collection<Plugin> plugins) {
for(Plugin plugin : plugins) schedule(plugin, true);
new Thread(this, "Poller").start();
}
private synchronized void schedule(Plugin plugin, boolean randomise) {
private void schedule(Plugin plugin, boolean randomise) {
if(plugin.shouldPoll()) {
long now = clock.currentTimeMillis();
long interval = plugin.getPollingInterval();
// Randomise intervals at startup to spread out connection attempts
if(randomise) interval = (long) (interval * Math.random());
pollTimes.add(new PollTime(now + interval, plugin));
timer.schedule(new PollTask(plugin), interval);
}
}
public synchronized void stop() {
pollTimes.clear();
notifyAll();
public void stop() {
timer.cancel();
}
public void run() {
while(true) {
synchronized(this) {
if(pollTimes.isEmpty()) {
LOG.info("Finished polling");
return;
}
long now = clock.currentTimeMillis();
final PollTime p = pollTimes.first();
if(now >= p.time) {
boolean removed = pollTimes.remove(p);
assert removed;
final Collection<ContactId> connected =
connRegistry.getConnectedContacts(p.plugin.getId());
if(LOG.isLoggable(INFO)) {
String name = p.plugin.getClass().getSimpleName();
LOG.info("Polling " + name);
}
pluginExecutor.execute(new Runnable() {
public void run() {
p.plugin.poll(connected);
}
});
schedule(p.plugin, false);
} else {
try {
wait(p.time - now);
} catch(InterruptedException e) {
LOG.warning("Interrupted while waiting to poll");
Thread.currentThread().interrupt();
return;
}
}
public void pollNow(final Plugin p) {
pluginExecutor.execute(new Runnable() {
public void run() {
if(LOG.isLoggable(INFO))
LOG.info("Polling " + p.getClass().getSimpleName());
p.poll(connRegistry.getConnectedContacts(p.getId()));
}
}
});
}
private static class PollTime implements Comparable<PollTime> {
private class PollTask extends TimerTask {
private final long time;
private final Plugin plugin;
private PollTime(long time, Plugin plugin) {
this.time = time;
private PollTask(Plugin plugin) {
this.plugin = plugin;
}
// Must be consistent with equals()
public int compareTo(PollTime p) {
if(time < p.time) return -1;
if(time > p.time) return 1;
return 0;
}
// Must be consistent with equals()
@Override
public int hashCode() {
return (int) (time ^ (time >>> 32)) ^ plugin.hashCode();
}
@Override
public boolean equals(Object o) {
if(o instanceof PollTime) {
PollTime p = (PollTime) o;
return time == p.time && plugin == p.plugin;
}
return false;
public void run() {
pollNow(plugin);
schedule(plugin, false);
}
}
}

1
briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java
View File

@@ -98,6 +98,7 @@ abstract class TcpPlugin implements DuplexPlugin {
SocketAddress local = ss.getLocalSocketAddress();
setLocalSocketAddress((InetSocketAddress) local);
if(LOG.isLoggable(INFO)) LOG.info("Listening on " + local);
callback.pollNow();
acceptContactConnections();
}
});