From 75446b7f7e6d875710e1a7ac9feedea8372ba938 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 19 Sep 2011 18:51:27 +0100
Subject: [PATCH] Collapsed ack handling into a single transaction.
The locks were being held across all transactions anyway, so there was
no granularity advantage to using multiple transactions.
---
.../sf/briar/db/DatabaseComponentImpl.java | 38 +++++--------------
1 file changed, 9 insertions(+), 29 deletions(-)
diff --git a/components/net/sf/briar/db/DatabaseComponentImpl.java b/components/net/sf/briar/db/DatabaseComponentImpl.java
index 526141eaa1..a4a4f974fa 100644
--- a/components/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/components/net/sf/briar/db/DatabaseComponentImpl.java
@@ -851,7 +851,6 @@ DatabaseCleaner.Callback {
}
public void receiveAck(ContactId c, Ack a) throws DbException {
- // Mark all messages in acked batches as seen
contactLock.readLock().lock();
try {
if(!containsContact(c)) throw new NoSuchContactException();
@@ -859,42 +858,23 @@ DatabaseCleaner.Callback {
try {
messageStatusLock.writeLock().lock();
try {
- // Remove the acked batches' outstanding batch records
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();
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);
} catch(DbException e) {
db.abortTransaction(txn);
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 {
messageStatusLock.writeLock().unlock();
}
--
GitLab