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

Allow event executor tasks to be attached to transactions.

Browse Source
This commit is contained in:
akwizgran
2018-11-12 14:48:01 +00:00
parent 0d0197fd2d
commit d603607a90
9 changed files with 213 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java
View File

@@ -7,11 +7,14 @@ import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
import org.briarproject.bramble.api.contact.event.ContactStatusChangedEvent;
import org.briarproject.bramble.api.contact.event.ContactVerifiedEvent;
import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.db.CommitAction;
import org.briarproject.bramble.api.db.CommitAction.Visitor;
import org.briarproject.bramble.api.db.ContactExistsException;
import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DbCallable;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.db.DbRunnable;
import org.briarproject.bramble.api.db.EventAction;
import org.briarproject.bramble.api.db.Metadata;
import org.briarproject.bramble.api.db.MigrationListener;
import org.briarproject.bramble.api.db.NoSuchContactException;
@@ -20,9 +23,10 @@ import org.briarproject.bramble.api.db.NoSuchLocalAuthorException;
import org.briarproject.bramble.api.db.NoSuchMessageException;
import org.briarproject.bramble.api.db.NoSuchTransportException;
import org.briarproject.bramble.api.db.NullableDbCallable;
import org.briarproject.bramble.api.db.TaskAction;
import org.briarproject.bramble.api.db.Transaction;
import org.briarproject.bramble.api.event.Event;
import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.event.EventExecutor;
import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.identity.AuthorId;
import org.briarproject.bramble.api.identity.LocalAuthor;
@@ -64,6 +68,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Logger;
@@ -92,25 +97,29 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
private final Database<T> db;
private final Class<T> txnClass;
private final EventBus eventBus;
private final ShutdownManager shutdown;
private final Executor eventExecutor;
private final ShutdownManager shutdownManager;
private final AtomicBoolean closed = new AtomicBoolean(false);
private final ReentrantReadWriteLock lock =
new ReentrantReadWriteLock(true);
private final Visitor visitor = new CommitActionVisitor();
@Inject
DatabaseComponentImpl(Database<T> db, Class<T> txnClass, EventBus eventBus,
ShutdownManager shutdown) {
@EventExecutor Executor eventExecutor,
ShutdownManager shutdownManager) {
this.db = db;
this.txnClass = txnClass;
this.eventBus = eventBus;
this.shutdown = shutdown;
this.eventExecutor = eventExecutor;
this.shutdownManager = shutdownManager;
}
@Override
public boolean open(SecretKey key, @Nullable MigrationListener listener)
throws DbException {
boolean reopened = db.open(key, listener);
shutdown.addShutdownHook(() -> {
shutdownManager.addShutdownHook(() -> {
try {
close();
} catch (DbException e) {
@@ -161,7 +170,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
try {
T txn = txnClass.cast(transaction.unbox());
if (transaction.isCommitted()) {
for (Event e : transaction.getEvents()) eventBus.broadcast(e);
for (CommitAction a : transaction.getActions())
a.accept(visitor);
} else {
db.abortTransaction(txn);
}
@@ -976,4 +986,17 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
db.updateTransportKeys(txn, ks);
}
}
private class CommitActionVisitor implements Visitor {
@Override
public void visit(EventAction a) {
eventBus.broadcast(a.getEvent());
}
@Override
public void visit(TaskAction a) {
eventExecutor.execute(a.getTask());
}
}
}

7
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseModule.java
View File

@@ -3,11 +3,13 @@ package org.briarproject.bramble.db;
import org.briarproject.bramble.api.db.DatabaseComponent;
import org.briarproject.bramble.api.db.DatabaseConfig;
import org.briarproject.bramble.api.event.EventBus;
import org.briarproject.bramble.api.event.EventExecutor;
import org.briarproject.bramble.api.lifecycle.ShutdownManager;
import org.briarproject.bramble.api.sync.MessageFactory;
import org.briarproject.bramble.api.system.Clock;
import java.sql.Connection;
import java.util.concurrent.Executor;
import javax.inject.Singleton;
@@ -27,8 +29,9 @@ public class DatabaseModule {
@Provides
@Singleton
DatabaseComponent provideDatabaseComponent(Database<Connection> db,
EventBus eventBus, ShutdownManager shutdown) {
EventBus eventBus, @EventExecutor Executor eventExecutor,
ShutdownManager shutdownManager) {
return new DatabaseComponentImpl<>(db, Connection.class, eventBus,
shutdown);
eventExecutor, shutdownManager);
}
}