Pass executor to scheduler.

bramble-core/src/main/java/org/briarproject/bramble/io/TimeoutMonitorImpl.java

@@ -55,7 +55,8 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 		synchronized (lock) {
 			if (streams.isEmpty()) {
 				task = scheduler.scheduleWithFixedDelay(this::checkTimeouts,
-						CHECK_INTERVAL_MS, CHECK_INTERVAL_MS, MILLISECONDS);
+						ioExecutor, CHECK_INTERVAL_MS, CHECK_INTERVAL_MS,
+						MILLISECONDS);
 			}
 			streams.add(stream);
 		}
@@ -73,23 +74,21 @@ class TimeoutMonitorImpl implements TimeoutMonitor {
 		if (toCancel != null) toCancel.cancel(false);
 	}
 
-	// Scheduler
+	@IoExecutor
 	private void checkTimeouts() {
-		ioExecutor.execute(() -> {
-			List<TimeoutInputStream> snapshot;
-			synchronized (lock) {
-				snapshot = new ArrayList<>(streams);
-			}
-			for (TimeoutInputStream stream : snapshot) {
-				if (stream.hasTimedOut()) {
-					LOG.info("Input stream has timed out");
-					try {
-						stream.close();
-					} catch (IOException e) {
-						logException(LOG, INFO, e);
-					}
+		List<TimeoutInputStream> snapshot;
+		synchronized (lock) {
+			snapshot = new ArrayList<>(streams);
+		}
+		for (TimeoutInputStream stream : snapshot) {
+			if (stream.hasTimedOut()) {
+				LOG.info("Input stream has timed out");
+				try {
+					stream.close();
+				} catch (IOException e) {
+					logException(LOG, INFO, e);
 				}
 			}
-		});
+		}
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/plugin/PollerImpl.java

@@ -118,6 +118,7 @@ class PollerImpl implements Poller, EventListener {
 		}
 	}
 
+	// TODO: Make this wakeful
 	private void connectToContact(ContactId c) {
 		for (SimplexPlugin s : pluginManager.getSimplexPlugins())
 			if (s.shouldPoll()) connectToContact(c, s);
@@ -189,8 +190,8 @@ class PollerImpl implements Poller, EventListener {
 				// it will abort safely when it finds it's been replaced
 				if (scheduled != null) scheduled.future.cancel(false);
 				PollTask task = new PollTask(p, due, randomiseNext);
-				Future<?> future = scheduler.schedule(() ->
-						ioExecutor.execute(task), delay, MILLISECONDS);
+				Future<?> future = scheduler.schedule(task, ioExecutor, delay,
+						MILLISECONDS);
 				tasks.put(t, new ScheduledPollTask(task, future));
 			}
 		} finally {
@@ -233,9 +234,9 @@ class PollerImpl implements Poller, EventListener {
 	private class ScheduledPollTask {
 
 		private final PollTask task;
-		private final Future future;
+		private final Future<?> future;
 
-		private ScheduledPollTask(PollTask task, Future future) {
+		private ScheduledPollTask(PollTask task, Future<?> future) {
 			this.task = task;
 			this.future = future;
 		}

bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java

@@ -143,8 +143,8 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 		} catch (DbException e) {
 			throw new ServiceException(e);
 		}
-		scheduler.scheduleWithFixedDelay(this::poll, POLLING_INTERVAL_MS,
-				POLLING_INTERVAL_MS, MILLISECONDS);
+		scheduler.scheduleWithFixedDelay(this::poll, worker,
+				POLLING_INTERVAL_MS, POLLING_INTERVAL_MS, MILLISECONDS);
 	}
 
 	@EventExecutor
@@ -204,12 +204,10 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 		return plugin.createRendezvousEndpoint(k, cs.alice, h);
 	}
 
-	// Scheduler
+	// Worker
 	private void poll() {
-		worker.execute(() -> {
-			removeExpiredPendingContacts();
-			for (PluginState ps : pluginStates.values()) poll(ps);
-		});
+		removeExpiredPendingContacts();
+		for (PluginState ps : pluginStates.values()) poll(ps);
 	}
 
 	// Worker

bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java

@@ -3,6 +3,7 @@ package org.briarproject.bramble.system;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.TaskScheduler;
 
+import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -10,8 +11,7 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
- * A {@link TaskScheduler} that delegates all calls to a
- * {@link ScheduledExecutorService}.
+ * A {@link TaskScheduler} that uses a {@link ScheduledExecutorService}.
  */
 @ThreadSafe
 @NotNullByDefault
@@ -24,13 +24,16 @@ class TaskSchedulerImpl implements TaskScheduler {
 	}
 
 	@Override
-	public Future<?> schedule(Runnable task, long delay, TimeUnit unit) {
-		return delegate.schedule(task, delay, unit);
+	public Future<?> schedule(Runnable task, Executor executor, long delay,
+			TimeUnit unit) {
+		Runnable execute = () -> executor.execute(task);
+		return delegate.schedule(execute, delay, unit);
 	}
 
 	@Override
-	public Future<?> scheduleWithFixedDelay(Runnable task, long delay,
-			long interval, TimeUnit unit) {
-		return delegate.scheduleWithFixedDelay(task, delay, interval, unit);
+	public Future<?> scheduleWithFixedDelay(Runnable task, Executor executor,
+			long delay, long interval, TimeUnit unit) {
+		Runnable execute = () -> executor.execute(task);
+		return delegate.scheduleWithFixedDelay(execute, delay, interval, unit);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/TransportKeyManagerImpl.java

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.crypto.TransportCrypto;
 import org.briarproject.bramble.api.db.DatabaseComponent;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -198,17 +199,16 @@ class TransportKeyManagerImpl implements TransportKeyManager {
 
 	private void scheduleKeyUpdate(long now) {
 		long delay = timePeriodLength - now % timePeriodLength;
-		scheduler.schedule(this::updateKeys, delay, MILLISECONDS);
+		scheduler.schedule(this::updateKeys, dbExecutor, delay, MILLISECONDS);
 	}
 
+	@DatabaseExecutor
 	private void updateKeys() {
-		dbExecutor.execute(() -> {
-			try {
-				db.transaction(false, this::updateKeys);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
+		try {
+			db.transaction(false, this::updateKeys);
+		} catch (DbException e) {
+			logException(LOG, WARNING, e);
+		}
 	}
 
 	@Override