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

Collapsed ack handling into a single transaction.

Browse Source 
The locks were being held across all transactions anyway, so there was
no granularity advantage to using multiple transactions.
This commit is contained in:
akwizgran
2011-09-19 18:51:27 +01:00
parent 3dd3742a96
commit 75446b7f7e
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
components/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -851,7 +851,6 @@ DatabaseCleaner.Callback {
} }
public void receiveAck(ContactId c, Ack a) throws DbException { public void receiveAck(ContactId c, Ack a) throws DbException {
// Mark all messages in acked batches as seen
contactLock.readLock().lock(); contactLock.readLock().lock();
try { try {
if(!containsContact(c)) throw new NoSuchContactException(); if(!containsContact(c)) throw new NoSuchContactException();
@@ -859,42 +858,23 @@ DatabaseCleaner.Callback {
try { try {
messageStatusLock.writeLock().lock(); messageStatusLock.writeLock().lock();
try { try {
// Remove the acked batches' outstanding batch records
Collection<BatchId> acks = a.getBatchIds(); Collection<BatchId> acks = a.getBatchIds();
for(BatchId ack : acks) {
T txn = db.startTransaction();
try {
db.removeAckedBatch(txn, c, ack);
db.commitTransaction(txn);
} catch(DbException e) {
db.abortTransaction(txn);
throw e;
}
}
if(LOG.isLoggable(Level.FINE))
LOG.fine("Received " + acks.size() + " acks");
// Find any lost batches that need to be retransmitted
Collection<BatchId> lost;
T txn = db.startTransaction(); T txn = db.startTransaction();
try { try {
lost = db.getLostBatches(txn, c); // Mark all messages in acked batches as seen
if(LOG.isLoggable(Level.FINE))
LOG.fine("Received " + acks.size() + " acks");
for(BatchId b : acks) db.removeAckedBatch(txn, c, b);
// Find any lost batches that need to be retransmitted
Collection<BatchId> lost = db.getLostBatches(txn, c);
if(LOG.isLoggable(Level.FINE))
LOG.fine(lost.size() + " lost batches");
for(BatchId b : lost) db.removeLostBatch(txn, c, b);
db.commitTransaction(txn); db.commitTransaction(txn);
} catch(DbException e) { } catch(DbException e) {
db.abortTransaction(txn); db.abortTransaction(txn);
throw e; throw e;
} }
for(BatchId batch : lost) {
txn = db.startTransaction();
try {
db.removeLostBatch(txn, c, batch);
db.commitTransaction(txn);
} catch(DbException e) {
db.abortTransaction(txn);
throw e;
}
}
if(LOG.isLoggable(Level.FINE))
LOG.fine("Removed " + lost.size() + " lost batches");
} finally { } finally {
messageStatusLock.writeLock().unlock(); messageStatusLock.writeLock().unlock();
} }